bzr commit into mysql-trunk branch (mattias.jonsson:3698)

[Mattias Jonsson]

#At file:///Users/mattiasj/mysql-bzr/topush-trunk/ based on revid:alexander.nozdrin@stripped

 3698 Mattias Jonsson	2011-02-22 [merge]
      merge

    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-02-21 15:55:58 +0000
+++ b/mysql-test/r/partition.result	2011-02-22 10:51:21 +0000
@@ -2263,6 +2263,7 @@ INSERT INTO t1 VALUES(0);
 DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 End of 5.1 tests
+# Start of 5.5 tests
 #
 # BUG#55385: UPDATE statement throws an error, but still updates
 #            the table entries
@@ -2311,3 +2312,15 @@ partkey	nokey
 
 DROP VIEW v1;
 DROP TABLE t1_part;
+# 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-02-21 15:55:58 +0000
+++ b/mysql-test/t/partition.test	2011-02-22 10:51:21 +0000
@@ -2266,6 +2266,7 @@ DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 
 --echo End of 5.1 tests
+--echo # Start of 5.5 tests
 
 --echo #
 --echo # BUG#55385: UPDATE statement throws an error, but still updates
@@ -2316,3 +2317,18 @@ SELECT * FROM t1_part;
 # Cleanup
 DROP VIEW v1;
 DROP TABLE t1_part;
+
+--echo # Moved from lock.test
+--echo # Separate case for partitioned tables is important
+--echo # 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;
+
+--echo # End of 5.5 tests

No bundle (reason: revision is a merge).