From: Mattias Jonsson
Date: May 25 2010 1:45pm
Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3027)
List-Archive: http://lists.mysql.com/commits/109188
Message-Id: <20100525134626.1F3C6A95078@witty.localhost>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_EhWYsczgAVhQHDAdJuDsjQ)"

--Boundary_(ID_EhWYsczgAVhQHDAdJuDsjQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-trunk-merge/ based on revid:alik@stripped

 3027 Mattias Jonsson	2010-05-25 [merge]
      merge

    modified:
      mysql-test/r/partition_error.result
      mysql-test/t/partition_error.test
      sql/ha_partition.cc
      sql/sql_parse.cc
=== modified file 'mysql-test/r/partition_error.result'
--- a/mysql-test/r/partition_error.result	2010-03-20 20:23:42 +0000
+++ b/mysql-test/r/partition_error.result	2010-05-25 13:45:01 +0000
@@ -1,5 +1,13 @@
 drop table if exists t1;
 #
+# Bug#49477: Assertion `0' failed in ha_partition.cc:5530
+# with temporary table and partitions
+#
+CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
+CREATE TEMPORARY TABLE tmp_t1 LIKE t1;
+ERROR HY000: Cannot create temporary table with partitions
+DROP TABLE t1;
+#
 # Bug#50392: insert_id is not reset for partitioned tables
 #            auto_increment on duplicate entry
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);

=== modified file 'mysql-test/t/partition_error.test'
--- a/mysql-test/t/partition_error.test	2010-03-20 20:23:42 +0000
+++ b/mysql-test/t/partition_error.test	2010-05-25 13:45:01 +0000
@@ -9,6 +9,15 @@ drop table if exists t1;
 --enable_warnings
  
 --echo #
+--echo # Bug#49477: Assertion `0' failed in ha_partition.cc:5530
+--echo # with temporary table and partitions
+--echo #
+CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
+--error ER_PARTITION_NO_TEMPORARY
+CREATE TEMPORARY TABLE tmp_t1 LIKE t1;
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#50392: insert_id is not reset for partitioned tables
 --echo #            auto_increment on duplicate entry
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2010-05-11 16:02:50 +0000
+++ b/sql/ha_partition.cc	2010-05-25 13:45:01 +0000
@@ -90,7 +90,9 @@ static int partition_initialize(void *p)
   partition_hton->create= partition_create_handler;
   partition_hton->partition_flags= partition_flags;
   partition_hton->alter_table_flags= alter_table_flags;
-  partition_hton->flags= HTON_NOT_USER_SELECTABLE | HTON_HIDDEN;
+  partition_hton->flags= HTON_NOT_USER_SELECTABLE |
+                         HTON_HIDDEN |
+                         HTON_TEMPORARY_NOT_SUPPORTED;
 
   return 0;
 }
@@ -1896,6 +1898,13 @@ uint ha_partition::del_ren_cre_table(con
   handler **file, **abort_file;
   DBUG_ENTER("del_ren_cre_table()");
 
+  /* Not allowed to create temporary partitioned tables */
+  if (create_info && create_info->options & HA_LEX_CREATE_TMP_TABLE)
+  {
+    my_error(ER_PARTITION_NO_TEMPORARY, MYF(0));
+    DBUG_RETURN(TRUE);
+  }
+
   if (get_from_handler_file(from, ha_thd()->mem_root))
     DBUG_RETURN(TRUE);
   DBUG_ASSERT(m_file_buffer);

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-05-23 20:41:18 +0000
+++ b/sql/sql_parse.cc	2010-05-25 13:45:01 +0000
@@ -2958,7 +2958,7 @@ end_with_restore_list:
           access is granted. We need to check if first_table->grant.privilege
           contains any table-specific privilege.
         */
-        DBUG_PRINT("debug", ("first_table->grant.privilege: %x",
+        DBUG_PRINT("debug", ("first_table->grant.privilege: %lx",
                              first_table->grant.privilege));
         if (check_some_access(thd, SHOW_CREATE_TABLE_ACLS, first_table) ||
             (first_table->grant.privilege & SHOW_CREATE_TABLE_ACLS) == 0)


--Boundary_(ID_EhWYsczgAVhQHDAdJuDsjQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/mattias.jonsson@stripped";
 name*1=01-ieg9yrpwypovygbt.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/mattias.jonsson@stripped";
 filename*1=01-ieg9yrpwypovygbt.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-merge/
# testament_sha1: d797c74d330f7d1bebc50f0b91e765ba636e263a
# timestamp: 2010-05-25 15:46:25 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/mysql-5.1-bugteam/
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--Boundary_(ID_EhWYsczgAVhQHDAdJuDsjQ)--