bzr commit into mysql-5.6-next-mr branch (kostja:2997)

[Konstantin Osipov]

#At file:///opt/local/work/next-4284/ based on revid:kostja@stripped

 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
=== 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]