Skip to content

Commit d2e1ed8

Browse files
committed
Fix innodb.rename_table for embedded
An embedded run will output the full path name instead of a relative one. Update results to cover both cases.
1 parent 170bec3 commit d2e1ed8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
call mtr.add_suppression("InnoDB: (Operating system error|The error means|Cannot rename file)");
22
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
33
RENAME TABLE t1 TO non_existing_db.t1;
4-
ERROR HY000: Error on rename of './test/t1' to './non_existing_db/t1' (errno: -1 "Internal error < 0 (Not system error)")
4+
ERROR HY000: Error on rename of '**path-to-t1**' to '**path-to-non-existing-db-t1**' (errno: -1 "Internal error < 0 (Not system error)")
55
DROP TABLE t1;

mysql-test/suite/innodb/t/rename_table.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
call mtr.add_suppression("InnoDB: (Operating system error|The error means|Cannot rename file)");
44

55
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
6-
--replace_result "\\" "/"
6+
--replace_regex /\'.*t1\' to/'**path-to-t1**' to/ /to \'.*non.*t1\'/to '**path-to-non-existing-db-t1**'/
77
--error ER_ERROR_ON_RENAME
88
RENAME TABLE t1 TO non_existing_db.t1;
99

0 commit comments

Comments
 (0)