From d2e1ed8b936a78ceeec0e64231997d7ed18a4daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org>
Date: Wed, 13 Jun 2018 08:33:25 +0300
Subject: [PATCH] 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.
---
 mysql-test/suite/innodb/r/rename_table.result | 2 +-
 mysql-test/suite/innodb/t/rename_table.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/innodb/r/rename_table.result b/mysql-test/suite/innodb/r/rename_table.result
index b2e15c87348..49ce3254091 100644
--- a/mysql-test/suite/innodb/r/rename_table.result
+++ b/mysql-test/suite/innodb/r/rename_table.result
@@ -1,5 +1,5 @@
 call mtr.add_suppression("InnoDB: (Operating system error|The error means|Cannot rename file)");
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 RENAME TABLE t1 TO non_existing_db.t1;
-ERROR HY000: Error on rename of './test/t1' to './non_existing_db/t1' (errno: -1 "Internal error < 0 (Not system error)")
+ERROR HY000: Error on rename of '**path-to-t1**' to '**path-to-non-existing-db-t1**' (errno: -1 "Internal error < 0 (Not system error)")
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/rename_table.test b/mysql-test/suite/innodb/t/rename_table.test
index 60df8b5d2ec..695c0915d14 100644
--- a/mysql-test/suite/innodb/t/rename_table.test
+++ b/mysql-test/suite/innodb/t/rename_table.test
@@ -3,7 +3,7 @@
 call mtr.add_suppression("InnoDB: (Operating system error|The error means|Cannot rename file)");
 
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
---replace_result "\\" "/"
+--replace_regex /\'.*t1\' to/'**path-to-t1**' to/ /to \'.*non.*t1\'/to '**path-to-non-existing-db-t1**'/
 --error ER_ERROR_ON_RENAME
 RENAME TABLE t1 TO non_existing_db.t1;
 
-- 
2.30.9