bk commit into 5.1 tree (jimw:1.2151) BUG#17497

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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
  1.2151 06/03/08 09:48:40 jimw@stripped +4 -0
  Bug #17497: Partitions: crash if add partition on temporary table
    Temporary tables are no longer allowed to be partitioned.

  sql/sql_table.cc
    1.312 06/03/08 09:48:36 jimw@stripped +5 -0
    Don't allow creating temporary table with partitions

  sql/share/errmsg.txt
    1.88 06/03/08 09:48:35 jimw@stripped +2 -1
    Add new error message

  mysql-test/t/partition.test
    1.20 06/03/08 09:48:35 jimw@stripped +6 -0
    Add new regression test

  mysql-test/r/partition.result
    1.17 06/03/08 09:48:35 jimw@stripped +2 -0
    Add result

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-17497

--- 1.311/sql/sql_table.cc	2006-03-06 01:23:51 -08:00
+++ 1.312/sql/sql_table.cc	2006-03-08 09:48:36 -08:00
@@ -2073,6 +2073,11 @@
     char *part_syntax_buf;
     uint syntax_len;
     handlerton *engine_type;
+    if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
+    {
+      my_error(ER_PARTITION_NO_TEMPORARY, MYF(0));
+      goto err;
+    }
     while ((key= key_iterator++))
     {
       if (key->type == Key::FOREIGN_KEY)

--- 1.87/sql/share/errmsg.txt	2006-03-01 12:35:42 -08:00
+++ 1.88/sql/share/errmsg.txt	2006-03-08 09:48:35 -08:00
@@ -5820,4 +5820,5 @@
         eng "Cannot change the binary logging format inside a stored function or trigger"
 ER_NDB_CANT_SWITCH_BINLOG_FORMAT
 	eng "The NDB cluster engine does not support changing the binlog format on the fly yet"
-
+ER_PARTITION_NO_TEMPORARY
+	eng "Cannot create temporary table with partitions"

--- 1.16/mysql-test/r/partition.result	2006-03-07 11:37:52 -08:00
+++ 1.17/mysql-test/r/partition.result	2006-03-08 09:48:35 -08:00
@@ -422,4 +422,6 @@
 x123	11,12	1
 x234	NULL,1	1
 drop table t1;
+create temporary table t1 (a int) partition by hash(a);
+ERROR HY000: Cannot create temporary table with partitions
 End of 5.1 tests

--- 1.19/mysql-test/t/partition.test	2006-03-07 11:37:52 -08:00
+++ 1.20/mysql-test/t/partition.test	2006-03-08 09:48:35 -08:00
@@ -540,4 +540,10 @@
 from information_schema.partitions where table_schema ='test';
 drop table t1;
 
+#
+# Bug #17497: Partitions: crash if add partition on temporary table
+#
+--error ER_PARTITION_NO_TEMPORARY
+create temporary table t1 (a int) partition by hash(a);
+
 --echo End of 5.1 tests