4 files changed, 66 insertions, 66 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 3f22d7e3bb1..a0719d51670 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1301,34 +1301,6 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1
 DROP TABLE t1;
-CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
-ERROR HY000: Incorrect arguments to DATA DIRECORY
-CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
-CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-DATA DIRECTORY = 'TEST_DIR/master-data/test',
-SUBPARTITION s0b
-DATA DIRECTORY = 'TEST_DIR/master-data/test'
-));
-ERROR HY000: Incorrect arguments to DATA DIRECORY
-CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-INDEX DIRECTORY = 'TEST_DIR/master-data/test',
-SUBPARTITION s0b
-INDEX DIRECTORY = 'TEST_DIR/master-data/test'
-));
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
 CREATE TABLE t1 (s1 BIGINT UNSIGNED)
 PARTITION BY RANGE (s1) (
 PARTITION p0 VALUES LESS THAN (0), 
diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
index 3a3897ec65b..501d3a469a1 100644
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/r/partition_not_windows.result
@@ -30,6 +30,34 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (i) (PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
 DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
+CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
+ERROR HY000: Incorrect arguments to DATA DIRECORY
+CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
+ERROR HY000: Incorrect arguments to INDEX DIRECORY
+CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+DATA DIRECTORY = 'TEST_DIR/master-data/test',
+SUBPARTITION s0b
+DATA DIRECTORY = 'TEST_DIR/master-data/test'
+));
+ERROR HY000: Incorrect arguments to DATA DIRECORY
+CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+INDEX DIRECTORY = 'TEST_DIR/master-data/test',
+SUBPARTITION s0b
+INDEX DIRECTORY = 'TEST_DIR/master-data/test'
+));
+ERROR HY000: Incorrect arguments to INDEX DIRECORY
 DROP TABLE IF EXISTS `example`;
 CREATE TABLE `example` (
 `ID_EXAMPLE` int(10) unsigned NOT NULL AUTO_INCREMENT,
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index e7e4111e261..c35626e06b7 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1546,44 +1546,6 @@ ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
 DROP TABLE t1;
 
 #
-# Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
-#
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
-
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
-SUBPARTITION s0b
-  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
-));
-
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
-SUBPARTITION s0b
-  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
-));
-
-#
 # Bug #29258: Partitions: search fails for maximum unsigned bigint
 #
 CREATE TABLE t1 (s1 BIGINT UNSIGNED)
diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test
index 836d5ab10e6..103fb05029e 100644
--- a/mysql-test/t/partition_not_windows.test
+++ b/mysql-test/t/partition_not_windows.test
@@ -94,6 +94,44 @@ show create table t2;
 DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
 
+#
+# Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
+#
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
+
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+SUBPARTITION s0b
+  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+));
+
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+SUBPARTITION s0b
+  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+));
+
 # End Windows specific test failures.
 
 # These tests contain non-Windows specific directory/file format.