bk commit into 5.1 tree (gluh:1.2582)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh.  When gluh does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-03 15:38:18+04:00, gluh@stripped +4 -0
  test case fix

  mysql-test/r/partition.result@stripped, 2008-03-03 15:38:14+04:00, gluh@stripped +0 -19
    the test is moved to 'partition_not_windows' test

  mysql-test/r/partition_not_windows.result@stripped, 2008-03-03 15:38:14+04:00, gluh@stripped
+19 -0
    the test is moved from 'partition' test

  mysql-test/t/partition.test@stripped, 2008-03-03 15:38:14+04:00, gluh@stripped +0 -29
    the test is moved to 'partition_not_windows' test

  mysql-test/t/partition_not_windows.test@stripped, 2008-03-03 15:38:14+04:00, gluh@stripped
+27 -0
    the test is moved from 'partition' test

diff -Nrup a/mysql-test/r/partition.result b/mysql-test/r/partition.result
--- a/mysql-test/r/partition.result	2008-02-28 16:46:49 +04:00
+++ b/mysql-test/r/partition.result	2008-03-03 15:38:14 +04:00
@@ -1207,25 +1207,6 @@ SELECT t2.id FROM t2 WHERE t2.id IN (SEL
 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 -Nrup a/mysql-test/r/partition_not_windows.result
b/mysql-test/r/partition_not_windows.result
--- a/mysql-test/r/partition_not_windows.result	2008-02-28 16:46:50 +04:00
+++ b/mysql-test/r/partition_not_windows.result	2008-03-03 15:38:14 +04:00
@@ -11,6 +11,25 @@ partition p2 VALUES LESS THAN (2) DATA D
 (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 -Nrup a/mysql-test/t/partition.test b/mysql-test/t/partition.test
--- a/mysql-test/t/partition.test	2008-02-28 16:46:50 +04:00
+++ b/mysql-test/t/partition.test	2008-03-03 15:38:14 +04:00
@@ -1399,35 +1399,6 @@ SELECT t2.id FROM t2 WHERE t2.id IN (SEL
 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> 
 #
 create table t1 (c1 varchar(255),c2 tinyint,primary key(c1))
diff -Nrup a/mysql-test/t/partition_not_windows.test
b/mysql-test/t/partition_not_windows.test
--- a/mysql-test/t/partition_not_windows.test	2008-02-28 16:46:50 +04:00
+++ b/mysql-test/t/partition_not_windows.test	2008-03-03 15:38:14 +04:00
@@ -67,6 +67,33 @@ eval ALTER TABLE t1 REORGANIZE PARTITION
 
 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.