bzr push into mysql-5.6-next-mr branch (kostja:2996 to 2997)

[Konstantin Osipov]

 2997 Konstantin Osipov	2009-12-08
      Backport of:
      ------------------------------------------------------------
      revno: 2617.43.3
      committer: Davi Arnaut <Davi.Arnaut@stripped>
      branch nick: 40188-6.0
      timestamp: Thu 2009-05-07 13:15:54 +0200
      message:
      Sort results as the file list of the database directory is not
      sorted (MY_DONT_SORT).
      
      (This is a follow-up fix for WL#4284).
     @ mysql-test/r/drop_debug.result
        Update test case result.
     @ mysql-test/t/drop_debug.test
        Sort warnings.

    modified:
      mysql-test/r/drop_debug.result
      mysql-test/t/drop_debug.test
 2996 Konstantin Osipov	2009-12-08
      Backport of:
      ------------------------------------------------------------
      revno: 2617.31.7
      committer: Davi Arnaut <Davi.Arnaut@stripped>
      branch nick: mysql-6.0-runtime
      timestamp: Wed 2009-03-25 19:22:00 -0300
      message:
      WL#4284: Transactional DDL locking
      
      Post-merge fixes for test cases.
     @ mysql-test/include/mix1.inc
        Ignore deadlock errors due to the table being altered.
     @ mysql-test/r/innodb_mysql.result
        Update test case result (WL$4284).
     @ mysql-test/suite/parts/r/partition_special_innodb.result
        The INSERT and SELECT are not necessary to reproduce the
        problem as the assertion happens when the table is being
        altered.
               
        Furthermore, the INSERT and SELECT will yield a deadlock
        error as after the alter the table version is set to zero,
        which means that any metadata locks on the table must be
        relinquished, but this won't happen voluntarily in a
        multi-statement transaction (metadata locks are released
        on commit or rollback). Reported as Bug#43867.
     @ mysql-test/suite/parts/t/partition_special_innodb.test
        The INSERT and SELECT are not necessary to reproduce the
        problem as the assertion happens when the table is being
        altered.
               
        Furthermore, the INSERT and SELECT will yield a deadlock
        error as after the alter the table version is set to zero,
        which means that any metadata locks on the table must be
        relinquished, but this won't happen voluntarily in a
        multi-statement transaction (metadata locks are released
        on commit or rollback). Reported as Bug#43867.

    modified:
      mysql-test/include/mix1.inc
      mysql-test/r/innodb_mysql.result
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/t/partition_special_innodb.test
=== modified file 'mysql-test/r/drop_debug.result'
--- a/mysql-test/r/drop_debug.result	2009-10-27 08:54:27 +0000
+++ b/mysql-test/r/drop_debug.result	2009-12-08 07:53:40 +0000
@@ -7,12 +7,16 @@ DROP DATABASE IF EXISTS mysql_test;
 
 CREATE DATABASE mysql_test;
 CREATE TABLE mysql_test.t1(a INT);
+CREATE TABLE mysql_test.t2(b INT);
+CREATE TABLE mysql_test.t3(c INT);
 
 SET SESSION DEBUG = "+d,bug43138";
 
 DROP DATABASE mysql_test;
 Warnings:
 Error	1051	Unknown table 't1'
+Error	1051	Unknown table 't2'
+Error	1051	Unknown table 't3'
 
 SET SESSION DEBUG = "-d,bug43138";
 

=== modified file 'mysql-test/t/drop_debug.test'
--- a/mysql-test/t/drop_debug.test	2009-10-27 08:54:27 +0000
+++ b/mysql-test/t/drop_debug.test	2009-12-08 07:53:40 +0000
@@ -17,11 +17,14 @@ DROP DATABASE IF EXISTS mysql_test;
 --echo
 CREATE DATABASE mysql_test;
 CREATE TABLE mysql_test.t1(a INT);
+CREATE TABLE mysql_test.t2(b INT);
+CREATE TABLE mysql_test.t3(c INT);
 
 --echo
 SET SESSION DEBUG = "+d,bug43138";
 
 --echo
+--sorted_result
 DROP DATABASE mysql_test;
 
 --echo


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