bzr commit into mysql-5.5 branch (mattias.jonsson:3280) Bug#47583

[Mattias Jonsson]

#At file:///Users/mattiasj/mysql-bzr/b47583-55/ based on revid:mattias.jonsson@stripped

 3280 Mattias Jonsson	2011-01-26
      Bug#47583: Test main.lock fails if server is compiled without support for partition
      
      Problem was lock.test used partitioning, but did not
      require partitioning to run.
      
      Solution was to move the specific test which used
      partitioning into partition.test instead.
     @ mysql-test/r/lock.result
        Updated result
     @ mysql-test/r/partition.result
        Updated result
     @ mysql-test/t/lock.test
        Moved partition test to partition.test
     @ mysql-test/t/partition-master.opt
        Old leftover file, no tests in partition.test
        requires symbolic-links (i.e. DATA/INDEX DIRECTORY)
     @ mysql-test/t/partition.test
        Moved test from lock.test

    removed:
      mysql-test/t/partition-master.opt
    modified:
      mysql-test/r/lock.result
      mysql-test/r/partition.result
      mysql-test/t/lock.test
      mysql-test/t/partition.test
=== modified file 'mysql-test/r/lock.result'
--- a/mysql-test/r/lock.result	2010-02-01 11:43:06 +0000
+++ b/mysql-test/r/lock.result	2011-01-26 22:06:30 +0000
@@ -385,18 +385,7 @@ ERROR HY000: Can't reopen table: 't1'
 alter table t1 add column j int;
 unlock tables;
 drop table t1;
-#
-# Separate case for partitioned tables is important
-# because each partition has an own thr_lock object.
-#
-create table t1 (i int) partition by list (i)
-(partition p0 values in (1),
-partition p1 values in (2,3),
-partition p2 values in (4,5));
-lock tables t1 write, t1 as a read, t1 as b read;
-alter table t1 add column j int;
-unlock tables;
-drop table t1;
+# Moved case for partitioned tables to partition.test
 #
 # Bug #43272 HANDLER SQL command does not work under LOCK TABLES
 #

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2011-01-10 14:08:31 +0000
+++ b/mysql-test/r/partition.result	2011-01-26 22:06:30 +0000
@@ -2264,3 +2264,17 @@ INSERT INTO t1 VALUES(0);
 DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 End of 5.1 tests
+# Start of 5.5 tests
+# Moved from lock.test
+# Separate case for partitioned tables is important
+# because each partition has an own thr_lock object.
+#
+create table t1 (i int) partition by list (i)
+(partition p0 values in (1),
+partition p1 values in (2,3),
+partition p2 values in (4,5));
+lock tables t1 write, t1 as a read, t1 as b read;
+alter table t1 add column j int;
+unlock tables;
+drop table t1;
+# End of 5.5 tests

=== modified file 'mysql-test/t/lock.test'
--- a/mysql-test/t/lock.test	2010-02-01 11:43:06 +0000
+++ b/mysql-test/t/lock.test	2011-01-26 22:06:30 +0000
@@ -451,18 +451,7 @@ lock tables t1 write, t1 as a read, t1 a
 alter table t1 add column j int;
 unlock tables;
 drop table t1;
---echo #
---echo # Separate case for partitioned tables is important
---echo # because each partition has an own thr_lock object.
---echo #
-create table t1 (i int) partition by list (i)
-  (partition p0 values in (1),
-   partition p1 values in (2,3),
-   partition p2 values in (4,5));
-lock tables t1 write, t1 as a read, t1 as b read;
-alter table t1 add column j int;
-unlock tables;
-drop table t1;
+--echo # Moved case for partitioned tables to partition.test
 
 
 --echo #

=== removed file 'mysql-test/t/partition-master.opt'
--- a/mysql-test/t/partition-master.opt	2006-09-08 09:57:37 +0000
+++ b/mysql-test/t/partition-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---symbolic-links=1

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2011-01-10 14:08:31 +0000
+++ b/mysql-test/t/partition.test	2011-01-26 22:06:30 +0000
@@ -2267,3 +2267,19 @@ DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 
 --echo End of 5.1 tests
+--echo # Start of 5.5 tests
+
+--echo # Moved from lock.test
+--echo # Separate case for partitioned tables is important
+--echo # because each partition has an own thr_lock object.
+--echo #
+create table t1 (i int) partition by list (i)
+  (partition p0 values in (1),
+   partition p1 values in (2,3),
+   partition p2 values in (4,5));
+lock tables t1 write, t1 as a read, t1 as b read;
+alter table t1 add column j int;
+unlock tables;
+drop table t1;
+
+--echo # End of 5.5 tests


Attachment: [text/bzr-bundle] bzr/[e-mail]