bk commit into 5.1 tree (holyfoot:1.2477) BUG#24633

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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, 2007-03-11 01:17:41+04:00, holyfoot@stripped +3 -0
  Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with
  partitioned tables"
  We have to ignore 'data directory' and 'index directory' parameters
  if NO_DIR_IN_CREATE set.

  mysql-test/r/partition.result@stripped, 2007-03-11 01:17:39+04:00, holyfoot@stripped +13 -0
    result fixed

  mysql-test/t/partition.test@stripped, 2007-03-11 01:17:39+04:00, holyfoot@stripped +17 -0
    testcase

  sql/partition_info.cc@stripped, 2007-03-11 01:17:39+04:00, holyfoot@stripped +2 -0
    clear data_field_name and index_field_name if NO_DIR_IN_CREATE set

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/24633/my51-24633

--- 1.58/mysql-test/r/partition.result	2007-03-11 01:17:45 +04:00
+++ 1.59/mysql-test/r/partition.result	2007-03-11 01:17:45 +04:00
@@ -1219,4 +1219,17 @@ 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'
+);
+DROP TABLE t1;
 End of 5.1 tests

--- 1.52/mysql-test/t/partition.test	2007-03-11 01:17:45 +04:00
+++ 1.53/mysql-test/t/partition.test	2007-03-11 01:17:45 +04:00
@@ -1463,4 +1463,21 @@ 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 
+#
+
+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'
+);
+
+DROP TABLE t1;
+
 --echo End of 5.1 tests

--- 1.34/sql/partition_info.cc	2007-03-11 01:17:45 +04:00
+++ 1.35/sql/partition_info.cc	2007-03-11 01:17:45 +04:00
@@ -776,6 +776,8 @@ bool partition_info::check_partition_inf
       partition_element *part_elem= part_it++;
       if (part_elem->engine_type == NULL)
         part_elem->engine_type= default_engine_type;
+      if (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)
+        part_elem->data_file_name= part_elem->index_file_name= 0;
       if (!is_sub_partitioned())
       {
         if (check_table_name(part_elem->partition_name,