bzr commit into mysql-pe branch (mattias.jonsson:3591) Bug#47135

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/b47135-mysql-pe/ based on
revid:joro@stripped

 3591 Mattias Jonsson	2009-09-09
      Bug#47135: Server crashes on "partition_alter2_1_innodb" +
"partition_alter2_2_innodb"
      
      First step only!
      
      rename to make it possible to split up the test without
      having merge issues later
      
      (and a small fix for removing DBUG warnings about missing
      DBUG_RETURN).
     @ sql/sql_partition.cc
        Bug#47135: Server crashes on "partition_alter2_1_innodb" +
"partition_alter2_2_innodb"
        
        Small fix for removing DBUG warnings about missing
        DBUG_RETURN.

    renamed:
      mysql-test/suite/parts/r/partition_alter2_1_innodb.result =>
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
      mysql-test/suite/parts/r/partition_alter2_2_innodb.result =>
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
      mysql-test/suite/parts/t/partition_alter2_1_innodb.test =>
mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_innodb.test =>
mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
    modified:
      sql/sql_partition.cc
=== renamed file 'mysql-test/suite/parts/r/partition_alter2_1_innodb.result' =>
'mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result'
=== renamed file 'mysql-test/suite/parts/r/partition_alter2_2_innodb.result' =>
'mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result'
=== renamed file 'mysql-test/suite/parts/t/partition_alter2_1_innodb.test' =>
'mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test'
=== renamed file 'mysql-test/suite/parts/t/partition_alter2_2_innodb.test' =>
'mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test'
=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2009-09-03 09:40:21 +0000
+++ b/sql/sql_partition.cc	2009-09-09 09:53:19 +0000
@@ -6807,7 +6807,7 @@ int get_part_iter_for_interval_via_mappi
         part_iter->part_nums.cur= part_iter->part_nums.start= 0;
         part_iter->part_nums.end= 0;
         part_iter->ret_null_part= part_iter->ret_null_part_orig= TRUE;
-        return 1;
+        DBUG_RETURN(1);
       }
       part_iter->part_nums.cur= part_iter->part_nums.start;
       if (part_iter->part_nums.start == max_endpoint_val)


Attachment: [text/bzr-bundle]