1 files changed, 36 insertions, 48 deletions
diff --git a/mysql-test/suite/parts/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result
index e5b31e0c154..d4b81fc74b5 100644
--- a/mysql-test/suite/parts/r/partition_bit_myisam.result
+++ b/mysql-test/suite/parts/r/partition_bit_myisam.result
@@ -12,18 +12,14 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 create table t1 (a bit(0), primary key (a)) engine='MyISAM' 
 partition by key (a) (
-partition pa1 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp',
-partition pa2 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp');
+partition pa1,
+partition pa2);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL DEFAULT '\0',
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION pa1 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM, PARTITION pa2 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION pa1 ENGINE = MyISAM, PARTITION pa2 ENGINE = MyISAM) */
 drop table t1;
 create table t1 (a bit(64), primary key (a)) engine='MyISAM' 
 partition by key (a) partitions 2;
@@ -49,24 +45,16 @@ FFFFFFFFFFFFFFFF
 drop table t1;
 create table t1 (a bit(64), primary key (a)) engine='MyISAM' 
 partition by key (a) (
-partition pa1 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp' max_rows=20 min_rows=2,
-partition pa2 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp' max_rows=30 min_rows=3,
-partition pa3 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp' max_rows=30 min_rows=4,
-partition pa4 DATA DIRECTORY =
-'/tmp' INDEX DIRECTORY =
-'/tmp' max_rows=40 min_rows=2);
+partition pa1 max_rows=20 min_rows=2,
+partition pa2 max_rows=30 min_rows=3,
+partition pa3 max_rows=30 min_rows=4,
+partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0',
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM, PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM, PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM, PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 DATA DIRECTORY = '/tmp' INDEX DIRECTORY = '/tmp' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
 (b'1000000000000000000000000000000000000000000000000000000000000000'),
@@ -142,20 +130,6 @@ count(*)
 select hex(a) from t3;
 hex(a)
 1
-2
-3
-4
-5
-6
-7
-8
-9
-A
-B
-C
-D
-E
-F
 10
 11
 12
@@ -172,6 +146,7 @@ F
 1D
 1E
 1F
+2
 20
 21
 22
@@ -188,6 +163,7 @@ F
 2D
 2E
 2F
+3
 30
 31
 32
@@ -204,6 +180,7 @@ F
 3D
 3E
 3F
+4
 40
 41
 42
@@ -220,6 +197,7 @@ F
 4D
 4E
 4F
+5
 50
 51
 52
@@ -235,6 +213,7 @@ F
 5D
 5E
 5F
+6
 60
 61
 62
@@ -251,6 +230,7 @@ F
 6D
 6E
 6F
+7
 70
 71
 72
@@ -267,6 +247,7 @@ F
 7D
 7E
 7F
+8
 80
 81
 82
@@ -283,6 +264,7 @@ F
 8D
 8E
 8F
+9
 90
 91
 92
@@ -299,6 +281,7 @@ F
 9D
 9E
 9F
+A
 A0
 A1
 A2
@@ -315,6 +298,7 @@ AC
 AD
 AE
 AF
+B
 B0
 B1
 B2
@@ -331,6 +315,7 @@ BC
 BD
 BE
 BF
+C
 C0
 C1
 C2
@@ -347,6 +332,7 @@ CC
 CD
 CE
 CF
+D
 D0
 D1
 D2
@@ -363,6 +349,7 @@ DC
 DD
 DE
 DF
+E
 E0
 E1
 E2
@@ -379,6 +366,7 @@ EC
 ED
 EE
 EF
+F
 F0
 F1
 F2
@@ -417,20 +405,6 @@ count(*)
 31
 select hex(a) from t4;
 hex(a)
-2
-3
-4
-5
-6
-7
-8
-9
-A
-B
-C
-D
-E
-F
 10
 11
 12
@@ -447,5 +421,19 @@ F
 1D
 1E
 1F
+2
 20
+3
+4
+5
+6
+7
+8
+9
+A
+B
+C
+D
+E
+F
 drop table t4;