WL#4189

 - dynamic configuration support
 - safe process
 - cleanups
 - create new suite for fedarated

1 files changed, 14 insertions, 13 deletions

diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test
index c9b95fc1664..37fef050147 100644
--- a/mysql-test/t/partition_error.test
+++ b/mysql-test/t/partition_error.test
@@ -103,7 +103,8 @@ partitions 3
  partition x2 tablespace ts2,
  partition x3 tablespace ts3);
 
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+let $MYSQLD_DATADIR= `select @@datadir`;
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 #
 # Partition by hash, invalid field in function
 #
@@ -199,7 +200,7 @@ partition by hash (a)
 partitions 2
 (partition x1 values less than (4),
  partition x2 values less than (5));
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Partition by hash, values in error
@@ -214,7 +215,7 @@ partition by hash (a)
 partitions 2
 (partition x1 values in (4),
  partition x2 values in (5));
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Partition by hash, values in error
@@ -229,7 +230,7 @@ partition by hash (a)
 partitions 2
 (partition x1 values in (4,6),
  partition x2 values in (5,7));
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by key, no partitions defined, single field
@@ -242,7 +243,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by key (b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by key, no partitions defined, list of fields
@@ -255,7 +256,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by key (a, b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by hash, no partitions defined
@@ -268,7 +269,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by hash (a+b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by key, no partitions defined, single field
@@ -281,7 +282,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by key (b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by key, no partitions defined, list of fields
@@ -294,7 +295,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by key (a, b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by hash, no partitions defined
@@ -307,7 +308,7 @@ c int not null,
 primary key (a,b))
 partition by key (a)
 subpartition by hash (a+b);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -334,7 +335,7 @@ partition by key (a)
 subpartition by hash (sin(a+b))
 (partition x1 (subpartition x11, subpartition x12),
  partition x2 (subpartition x21, subpartition x22));
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -363,7 +364,7 @@ partition by range (a)
 subpartition by key (a,d)
 (partition x1 values less than (1) (subpartition x11, subpartition x12),
  partition x2 values less than (2) (subpartition x21, subpartition x22));
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -401,7 +402,7 @@ b int not null,
 c int not null,
 primary key(a,b))
 partition by range (a);
-select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
+select load_file('$MYSQLD_DATADIR/test/t1.par');
 
 #
 # Partition by range, invalid field in function