From: Mattias Jonsson Date: January 26 2011 10:06pm Subject: bzr commit into mysql-5.5 branch (mattias.jonsson:3280) Bug#47583 List-Archive: http://lists.mysql.com/commits/129707 X-Bug: 47583 Message-Id: <201101262208.p0QEtoqA011448@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0899701337886271256==" --===============0899701337886271256== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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 --===============0899701337886271256== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # 1yigz7vels31pofk # target_branch: file:///Users/mattiasj/mysql-bzr/b47583-55/ # testament_sha1: 20d2b36fc8d5d8b1cf2c34d7182bcc4b42271868 # timestamp: 2011-01-26 23:06:44 +0100 # base_revision_id: mattias.jonsson@stripped\ # 8fngni1uuyybmz9u # # Begin bundle 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 IpwoSFYIjgSA --===============0899701337886271256==--