List:Commits« Previous MessageNext Message »
From:Dmitry Lenev Date:May 1 2009 1:37pm
Subject:bzr commit into mysql-6.0-falcon branch (dlenev:2771) Bug#43138
View as plain text  
#At file:///home/dlenev/src/bzr/mysql-6.0-runtime/ based on revid:magne.mahre@stripped

 2771 Dmitry Lenev	2009-05-01
      Follow-up for fix for bug "Bug#43138: DROP DATABASE failure
      does not clean up message list".
      
      Fixed drop.test failure under non-debug server by moving part
      of test dependent on debug-only feature to separate .test file,
      which won't be run for non-debug versions of server.

    added:
      mysql-test/r/drop_debug.result
      mysql-test/t/drop_debug.test
    modified:
      mysql-test/r/drop.result
      mysql-test/t/drop.test
=== modified file 'mysql-test/r/drop.result'
--- a/mysql-test/r/drop.result	2009-04-30 15:31:30 +0000
+++ b/mysql-test/r/drop.result	2009-05-01 13:37:34 +0000
@@ -141,28 +141,3 @@ Error	1146	Table 'mysql.proc' doesn't ex
 # --
 
 End of 5.1 tests
-
-# --
-# -- Bug#43138: DROP DATABASE failure does not clean up message list.
-# --
-
-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 't3'
-Error	1051	Unknown table 't2'
-Error	1051	Unknown table 't1'
-
-SET SESSION DEBUG = "-d,bug43138";
-
-# --
-# -- End of Bug#43138.
-# --

=== added file 'mysql-test/r/drop_debug.result'
--- a/mysql-test/r/drop_debug.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/drop_debug.result	2009-05-01 13:37:34 +0000
@@ -0,0 +1,25 @@
+
+# --
+# -- Bug#43138: DROP DATABASE failure does not clean up message list.
+# --
+
+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 't3'
+Error	1051	Unknown table 't2'
+Error	1051	Unknown table 't1'
+
+SET SESSION DEBUG = "-d,bug43138";
+
+# --
+# -- End of Bug#43138.
+# --

=== modified file 'mysql-test/t/drop.test'
--- a/mysql-test/t/drop.test	2009-04-30 15:31:30 +0000
+++ b/mysql-test/t/drop.test	2009-05-01 13:37:34 +0000
@@ -232,36 +232,3 @@ DROP DATABASE mysql_test;
 
 --echo
 --echo End of 5.1 tests
-
-###########################################################################
---echo
---echo # --
---echo # -- Bug#43138: DROP DATABASE failure does not clean up message list.
---echo # --
---echo
-
---disable_warnings
-DROP DATABASE IF EXISTS mysql_test;
---enable_warnings
-
---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
-DROP DATABASE mysql_test;
-
---echo
-SET SESSION DEBUG = "-d,bug43138";
-
---echo
---echo # --
---echo # -- End of Bug#43138.
---echo # --
-
-###########################################################################

=== added file 'mysql-test/t/drop_debug.test'
--- a/mysql-test/t/drop_debug.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/drop_debug.test	2009-05-01 13:37:34 +0000
@@ -0,0 +1,37 @@
+# 
+# DROP-related tests which execution requires debug server.
+#
+--source include/have_debug.inc
+
+###########################################################################
+--echo
+--echo # --
+--echo # -- Bug#43138: DROP DATABASE failure does not clean up message list.
+--echo # --
+--echo
+
+--disable_warnings
+DROP DATABASE IF EXISTS mysql_test;
+--enable_warnings
+
+--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
+DROP DATABASE mysql_test;
+
+--echo
+SET SESSION DEBUG = "-d,bug43138";
+
+--echo
+--echo # --
+--echo # -- End of Bug#43138.
+--echo # --
+
+###########################################################################


Attachment: [text/bzr-bundle] bzr/dlenev@mysql.com-20090501133734-efqzkr9atk4d6sb4.bundle
Thread
bzr commit into mysql-6.0-falcon branch (dlenev:2771) Bug#43138Dmitry Lenev1 May