Merge dator5.(none):/home/pappa/bug16000

into  dator5.(none):/home/pappa/bug19281


mysql-test/t/partition_mgm.test:
  Auto merged

2 files changed, 18 insertions, 2 deletions

diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test
index 076c5c5773b..d0e3f355292 100644
--- a/mysql-test/t/partition_error.test
+++ b/mysql-test/t/partition_error.test
@@ -107,6 +107,8 @@ partitions 3
 (partition x1 tablespace ts1,
  partition x2 tablespace ts2,
  partition x3 tablespace ts3);
+
+select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par');
 #
 # Partition by hash, invalid field in function
 #
@@ -202,6 +204,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');
 
 #
 # Partition by hash, values in error
@@ -216,6 +219,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');
 
 #
 # Partition by hash, values in error
@@ -230,6 +234,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');
 
 #
 # Subpartition by key, no partitions defined, single field
@@ -242,6 +247,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');
 
 #
 # Subpartition by key, no partitions defined, list of fields
@@ -254,6 +260,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');
 
 #
 # Subpartition by hash, no partitions defined
@@ -266,6 +273,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');
 
 #
 # Subpartition by key, no partitions defined, single field
@@ -278,6 +286,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');
 
 #
 # Subpartition by key, no partitions defined, list of fields
@@ -290,6 +299,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');
 
 #
 # Subpartition by hash, no partitions defined
@@ -302,6 +312,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');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -328,6 +339,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');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -356,6 +368,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');
 
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
@@ -393,6 +406,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');
 
 #
 # Partition by range, invalid field in function
diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test
index afc3b85ea4d..cfb76192de4 100644
--- a/mysql-test/t/partition_mgm.test
+++ b/mysql-test/t/partition_mgm.test
@@ -6,10 +6,12 @@ CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30))
 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2;
 SHOW CREATE TABLE t1;
 
-#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+--replace_result $MYSQLTEST_VARDIR "hello"
+--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
 ALTER TABLE t1 COALESCE PARTITION 1;
 SHOW CREATE TABLE t1;
-#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+--replace_result $MYSQLTEST_VARDIR "hello"
+--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*