MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:December 9 2008 1:31pm
Subject:bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:2738)
View as plain text  
#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/

 2738 Mattias Jonsson	2008-12-09 [merge]
      merge
modified:
  mysql-test/r/partition_mgm.result
  mysql-test/t/partition_mgm.test
  sql/partition_info.cc
  sql/sql_partition.cc

=== modified file 'mysql-test/r/partition_mgm.result'
--- a/mysql-test/r/partition_mgm.result	2008-11-04 07:43:21 +0000
+++ b/mysql-test/r/partition_mgm.result	2008-12-09 13:31:36 +0000
@@ -1,4 +1,11 @@
 DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a INT PRIMARY KEY)
+ENGINE MYISAM
+PARTITION BY HASH (a)
+PARTITIONS 1;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+ALTER TABLE t1 REORGANIZE PARTITION;
+DROP TABLE t1;
 create table t1 (a int)
 partition by range (a)
 subpartition by key (a)

=== modified file 'mysql-test/t/partition_mgm.test'
--- a/mysql-test/t/partition_mgm.test	2008-11-04 07:43:21 +0000
+++ b/mysql-test/t/partition_mgm.test	2008-12-09 13:31:36 +0000
@@ -4,6 +4,17 @@ DROP TABLE IF EXISTS t1;
 --enable_warnings
 
 #
+# Bug 40389: REORGANIZE PARTITION crashes when only using one partition
+#
+CREATE TABLE t1 (a INT PRIMARY KEY)
+ENGINE MYISAM
+PARTITION BY HASH (a)
+PARTITIONS 1;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+ALTER TABLE t1 REORGANIZE PARTITION;
+DROP TABLE t1;
+
+#
 # Bug 21143: mysqld hang when error in number of subparts in
 #            REORGANIZE command
 #

=== modified file 'sql/partition_info.cc'
--- a/sql/partition_info.cc	2008-10-07 22:14:58 +0000
+++ b/sql/partition_info.cc	2008-12-02 10:18:01 +0000
@@ -867,6 +867,7 @@ bool partition_info::check_partition_inf
 
     if (part_type != HASH_PARTITION || !list_of_part_fields)
     {
+      DBUG_ASSERT(part_expr);
       err= part_expr->walk(&Item::check_partition_func_processor, 0,
                            NULL);
       if (!err && is_sub_partitioned() && !list_of_subpart_fields)

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2008-11-12 12:36:53 +0000
+++ b/sql/sql_partition.cc	2008-12-09 13:31:36 +0000
@@ -4233,9 +4233,8 @@ uint prep_alter_part_table(THD *thd, TAB
           after the change as before. Thus we can reply ok immediately
           without any changes at all.
         */
-        DBUG_RETURN(fast_end_partition(thd, ULL(0), ULL(0),
-                                       table, NULL,
-                                       TRUE, NULL, FALSE));
+        *fast_alter_partition= TRUE;
+        DBUG_RETURN(FALSE);
       }
       else if (new_part_no > curr_part_no)
       {

Thread
bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:2738)Mattias Jonsson9 Dec