From 1411d27977a66b5612bfaf941e156faa9f56a96a Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/mgluh.(none)" <>
Date: Mon, 3 Mar 2008 15:38:18 +0400
Subject: [PATCH] test case fix

---
 mysql-test/r/partition.result             | 19 ---------------
 mysql-test/r/partition_not_windows.result | 19 +++++++++++++++
 mysql-test/t/partition.test               | 29 -----------------------
 mysql-test/t/partition_not_windows.test   | 27 +++++++++++++++++++++
 4 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index be3c68e6c18..3f22d7e3bb1 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1207,25 +1207,6 @@ SELECT t2.id FROM t2 WHERE t2.id IN (SELECT id FROM t1 WHERE status = 'Verified'
 id
 22589
 drop table t1, t2;
-set @org_mode=@@sql_mode;
-set @@sql_mode='NO_DIR_IN_CREATE';
-select @@sql_mode;
-@@sql_mode
-NO_DIR_IN_CREATE
-create table t1 (i int )
-partition by range (i)
-(
-partition p01 values less than (1000)
-data directory='/not/existing'
-    index directory='/not/existing'
-);
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `i` int(11) DEFAULT NULL
-) 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 (c1 varchar(255),c2 tinyint,primary key(c1))
 partition by key (c1) partitions 10 ;
 insert into t1 values ('aaa','1') on duplicate key update c2 = c2 + 1;
diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
index af36673a3e0..3a3897ec65b 100644
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/r/partition_not_windows.result
@@ -11,6 +11,25 @@ partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX
 (SUBPARTITION subpart20, SUBPARTITION subpart21));
 Checking if file exists after alter
 drop table t1;
+set @org_mode=@@sql_mode;
+set @@sql_mode='NO_DIR_IN_CREATE';
+select @@sql_mode;
+@@sql_mode
+NO_DIR_IN_CREATE
+create table t1 (i int )
+partition by range (i)
+(
+partition p01 values less than (1000)
+data directory='/not/existing'
+  index directory='/not/existing'
+);
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `i` int(11) DEFAULT NULL
+) 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;
 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 d889fe83dc1..e7e4111e261 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1398,35 +1398,6 @@ SELECT t2.id FROM t2 WHERE t2.id IN (SELECT id FROM t1 WHERE status = 'Verified'
 
 drop table t1, t2;
 
-#
-# Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables 
-#
-
-disable_query_log;
-eval create table t2 (i int )
-partition by range (i)
-(
-    partition p01 values less than (1000)
-    data directory="$MYSQLTEST_VARDIR/tmp/"
-    index directory="$MYSQLTEST_VARDIR/tmp/"
-);
-enable_query_log;
-
-set @org_mode=@@sql_mode;
-set @@sql_mode='NO_DIR_IN_CREATE';
-select @@sql_mode;
-create table t1 (i int )
-partition by range (i)
-(
-    partition p01 values less than (1000)
-    data directory='/not/existing'
-    index directory='/not/existing'
-);
-
-show create table t2;
-DROP TABLE t1, t2;
-set @@sql_mode=@org_mode;
-
 #
 # Bug #27123 partition + on duplicate key update + varchar = Can't find record in <table> 
 #
diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test
index c5f54286095..836d5ab10e6 100644
--- a/mysql-test/t/partition_not_windows.test
+++ b/mysql-test/t/partition_not_windows.test
@@ -67,6 +67,33 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
 
 drop table t1;
 
+#
+# Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables
+#
+disable_query_log;
+eval create table t2 (i int )
+partition by range (i)
+(
+ partition p01 values less than (1000)
+ data directory="$MYSQLTEST_VARDIR/tmp/"
+ index directory="$MYSQLTEST_VARDIR/tmp/"
+);
+enable_query_log;
+          
+set @org_mode=@@sql_mode;
+set @@sql_mode='NO_DIR_IN_CREATE';
+select @@sql_mode;
+create table t1 (i int )
+partition by range (i)
+(
+  partition p01 values less than (1000)
+  data directory='/not/existing'
+  index directory='/not/existing'
+);
+show create table t2;
+DROP TABLE t1, t2;
+set @@sql_mode=@org_mode;
+
 # End Windows specific test failures.
 
 # These tests contain non-Windows specific directory/file format.