Fix drop_combinations for embedded

Make sure to replace the datadir absolute path.

1 files changed, 52 insertions, 0 deletions

diff --git a/mysql-test/main/drop_combinations.test b/mysql-test/main/drop_combinations.test
index 0d58b13ddd3..8b3ad43793b 100644
--- a/mysql-test/main/drop_combinations.test
+++ b/mysql-test/main/drop_combinations.test
@@ -16,36 +16,46 @@ let $create_option=;
 
 --error ER_BAD_TABLE_ERROR
 drop table t1,t2,t3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop table t1,t3,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop table t1,t4,t2,t3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 drop table t1,s1,s2,t2;
 --source drop_combinations.inc
 --error ER_IT_IS_A_VIEW
 drop table t1,v1,v2,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_IT_IS_A_VIEW
 drop table v1,s1,s2,v2,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --remove_file $DATADIR/test/t1.MYD
+--replace_result $DATADIR ./
 --error ER_IT_IS_A_VIEW
 drop table t1,s1,v1,t3,t4;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_IT_IS_A_VIEW
 drop table s2,v2,t2,t1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
+--replace_result $DATADIR ./
 --error ER_IT_IS_A_VIEW
 drop table s1,v1,s2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 
@@ -67,9 +77,11 @@ drop table if exists v1,s1,s2,v2,t2;
 --source drop_combinations.inc
 --remove_file $DATADIR/test/t1.MYD
 --replace_result \\ /
+--replace_result $DATADIR ./
 drop table if exists t1,s1,v1,t3,t4;
 drop table if exists s2,v2,t2,t1;
 --source drop_combinations.inc
+--replace_result $DATADIR ./
 drop table if exists s1,v1,s2,v2;
 --source drop_combinations.inc
 
@@ -88,36 +100,44 @@ let $create_option=temporary;
 
 --error ER_BAD_TABLE_ERROR
 drop temporary table t1,t2,t3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table t1,t3,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table t1,t4,t2,t3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 drop temporary table t1,s1,s2,t2;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table t1,v1,v2,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table v1,s1,s2,v2,t2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table t1,s1,v1,t3,t4;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table s2,v2,t2,t1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_BAD_TABLE_ERROR
 drop temporary table s1,v1,s2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 
@@ -154,42 +174,52 @@ drop temporary sequence s1,s2;
 
 --error ER_UNKNOWN_SEQUENCES
 drop sequence s1,s2,s3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop sequence s1,s3,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop sequence s1,s4,s2,s3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_NOT_SEQUENCE2
 drop sequence s1,t1,t2,s2,s3,s4;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_IT_IS_A_VIEW
 drop sequence s1,v1,v2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_IT_IS_A_VIEW
 drop sequence v1,t1,t2,v2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_NOT_SEQUENCE2
 drop sequence t1,v1,t2,v2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --remove_file $DATADIR/test/s1.MYD
 --replace_result \\ /
 --error ER_NOT_SEQUENCE2
 drop sequence s1,t1,v1,t3,s4;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_NOT_SEQUENCE2
 drop sequence t2,v2,s2,s1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_NOT_SEQUENCE2
 drop sequence t1,v1,t2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 
@@ -211,6 +241,7 @@ drop sequence if exists v1,t1,t2,v2,s2;
 --source drop_combinations.inc
 --remove_file $DATADIR/test/s1.MYD
 --replace_result \\ /
+--replace_result $DATADIR ./
 drop sequence if exists s1,t1,v1,t3,s4;
 drop sequence if exists t2,v2,s2,s1;
 --source drop_combinations.inc
@@ -233,37 +264,46 @@ let $create_option=temporary;
 
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,s2,s3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,s3,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,s4,s2,s3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,t1,t2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,v1,v2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence v1,t1,t2,v2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence s1,t1,v1,t3,s4;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence t2,v2,s2,s1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_SEQUENCES
 drop temporary sequence t1,v1,t2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 
@@ -300,44 +340,56 @@ drop temporary sequence s1,s2;
 
 --error ER_UNKNOWN_VIEW
 drop view v1,v2,v3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view v1,v3,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view v1,v4,v2,v3;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view v1,t1,t2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view v1,s1,s2,v2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --remove_file $DATADIR/test/t1.MYD
 --replace_result \\ /
 --error ER_UNKNOWN_VIEW
 drop view s1,t1,t2,s2,v2;
+--replace_result $DATADIR ./
 show warnings;
+--replace_result $DATADIR ./
 drop table t1;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_UNKNOWN_VIEW
 drop view v1,t1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view v1,t1,s1,t3,v4;
+--replace_result $DATADIR ./
 show warnings;
 --error ER_UNKNOWN_VIEW
 drop view t2,s2,v2,v1;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc
 --error ER_UNKNOWN_VIEW
 drop view t1,s1,t2,s2;
+--replace_result $DATADIR ./
 show warnings;
 --source drop_combinations.inc