List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:September 29 2010 8:07am
Subject:bzr commit into mysql-5.5-runtime branch (jon.hauglid:3147) Bug#46165
View as plain text  
#At file:///export/home/x/mysql-5.5-runtime-test/ based on revid:jon.hauglid@stripped

 3147 Jon Olav Hauglid	2010-09-29
      Followup to Bug#46165 server crash in dbug
      
      This patch moves the regression test from variables.test to
      variables_debug.test as the debug system variable is not 
      available on release builds.

    modified:
      mysql-test/r/variables.result
      mysql-test/r/variables_debug.result
      mysql-test/t/variables.test
      mysql-test/t/variables_debug.test
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2010-09-28 09:07:58 +0000
+++ b/mysql-test/r/variables.result	2010-09-29 08:07:56 +0000
@@ -1699,47 +1699,3 @@ set @@session.autocommit=t1_min(), @@ses
 drop table t1;
 drop function t1_min;
 drop function t1_max;
-#
-# Bug#46165 server crash in dbug
-#
-SET @old_globaldebug = @@global.debug;
-SET @old_sessiondebug= @@session.debug;
-# Test 1 - Bug test case, single connection
-SET GLOBAL  debug= '+O,../../log/bug46165.1.trace';
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
-# Test 2 - Bug test case, two connections
-# Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
-SET SESSION debug= '-d:-t:-i';
-# Connection con1
-SET GLOBAL  debug= '';
-# Connection default
-SET SESSION debug= '';
-# Connection con1
-# Connection default
-SET GLOBAL  debug= '';
-# Test 3 - Active session trace file on disconnect
-# Connection con1
-SET GLOBAL  debug= '+O,../../log/bug46165.3.trace';
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-# Test 4 - Active session trace file on two connections
-# Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
-SET SESSION debug= '-d:-t:-i';
-# Connection con1
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
-# Connection default
-SET SESSION debug= '';
-# Connection con1
-# Connection default
-# Test 5 - Different trace files
-SET SESSION debug= '+O,../../log/bug46165.5.trace';
-SET SESSION debug= '+O,../../log/bug46165.6.trace';
-SET SESSION debug= '-O';
-SET GLOBAL  debug= @old_globaldebug;
-SET SESSION debug= @old_sessiondebug;

=== modified file 'mysql-test/r/variables_debug.result'
--- a/mysql-test/r/variables_debug.result	2010-05-23 20:41:18 +0000
+++ b/mysql-test/r/variables_debug.result	2010-09-29 08:07:56 +0000
@@ -32,3 +32,47 @@ SELECT @@global.debug;
 
 SET GLOBAL debug=@old_debug;
 End of 5.1 tests
+#
+# Bug#46165 server crash in dbug
+#
+SET @old_globaldebug = @@global.debug;
+SET @old_sessiondebug= @@session.debug;
+# Test 1 - Bug test case, single connection
+SET GLOBAL  debug= '+O,../../log/bug46165.1.trace';
+SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug= '';
+SET SESSION debug= '';
+# Test 2 - Bug test case, two connections
+# Connection default
+SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
+SET SESSION debug= '-d:-t:-i';
+# Connection con1
+SET GLOBAL  debug= '';
+# Connection default
+SET SESSION debug= '';
+# Connection con1
+# Connection default
+SET GLOBAL  debug= '';
+# Test 3 - Active session trace file on disconnect
+# Connection con1
+SET GLOBAL  debug= '+O,../../log/bug46165.3.trace';
+SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug= '';
+# Test 4 - Active session trace file on two connections
+# Connection default
+SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
+SET SESSION debug= '-d:-t:-i';
+# Connection con1
+SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug= '';
+SET SESSION debug= '';
+# Connection default
+SET SESSION debug= '';
+# Connection con1
+# Connection default
+# Test 5 - Different trace files
+SET SESSION debug= '+O,../../log/bug46165.5.trace';
+SET SESSION debug= '+O,../../log/bug46165.6.trace';
+SET SESSION debug= '-O';
+SET GLOBAL  debug= @old_globaldebug;
+SET SESSION debug= @old_sessiondebug;

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2010-09-28 09:07:58 +0000
+++ b/mysql-test/t/variables.test	2010-09-29 08:07:56 +0000
@@ -1432,78 +1432,3 @@ drop function t1_max;
 
 
 ###########################################################################
-
-
---echo #
---echo # Bug#46165 server crash in dbug
---echo #
-
-SET @old_globaldebug = @@global.debug;
-SET @old_sessiondebug= @@session.debug;
-
---echo # Test 1 - Bug test case, single connection
-SET GLOBAL  debug= '+O,../../log/bug46165.1.trace';
-SET SESSION debug= '-d:-t:-i';
-
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
-
---echo # Test 2 - Bug test case, two connections
---echo # Connection default
-connection default;
-SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
-SET SESSION debug= '-d:-t:-i';
-
---echo # Connection con1
-connect (con1, localhost, root);
-SET GLOBAL  debug= '';
-
---echo # Connection default
-connection default;
-SET SESSION debug= '';
---echo # Connection con1
-connection con1;
-disconnect con1;
---source include/wait_until_disconnected.inc
---echo # Connection default
-connection default;
-SET GLOBAL  debug= '';
-
---echo # Test 3 - Active session trace file on disconnect
---echo # Connection con1
-connect (con1, localhost, root);
-SET GLOBAL  debug= '+O,../../log/bug46165.3.trace';
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-disconnect con1;
---source include/wait_until_disconnected.inc
-
---echo # Test 4 - Active session trace file on two connections
---echo # Connection default
-connection default;
-SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
-SET SESSION debug= '-d:-t:-i';
-
---echo # Connection con1
-connect (con1, localhost, root);
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
-
---echo # Connection default
-connection default;
-SET SESSION debug= '';
---echo # Connection con1
-connection con1;
-disconnect con1;
---source include/wait_until_disconnected.inc
---echo # Connection default
-connection default;
-
---echo # Test 5 - Different trace files
-SET SESSION debug= '+O,../../log/bug46165.5.trace';
-SET SESSION debug= '+O,../../log/bug46165.6.trace';
-SET SESSION debug= '-O';
-
-SET GLOBAL  debug= @old_globaldebug;
-SET SESSION debug= @old_sessiondebug;

=== modified file 'mysql-test/t/variables_debug.test'
--- a/mysql-test/t/variables_debug.test	2010-05-23 20:41:18 +0000
+++ b/mysql-test/t/variables_debug.test	2010-09-29 08:07:56 +0000
@@ -36,3 +36,78 @@ SELECT @@global.debug;
 SET GLOBAL debug=@old_debug;
 
 --echo End of 5.1 tests
+
+
+--echo #
+--echo # Bug#46165 server crash in dbug
+--echo #
+
+SET @old_globaldebug = @@global.debug;
+SET @old_sessiondebug= @@session.debug;
+
+--echo # Test 1 - Bug test case, single connection
+SET GLOBAL  debug= '+O,../../log/bug46165.1.trace';
+SET SESSION debug= '-d:-t:-i';
+
+SET GLOBAL  debug= '';
+SET SESSION debug= '';
+
+--echo # Test 2 - Bug test case, two connections
+--echo # Connection default
+connection default;
+SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
+SET SESSION debug= '-d:-t:-i';
+
+--echo # Connection con1
+connect (con1, localhost, root);
+SET GLOBAL  debug= '';
+
+--echo # Connection default
+connection default;
+SET SESSION debug= '';
+--echo # Connection con1
+connection con1;
+disconnect con1;
+--source include/wait_until_disconnected.inc
+--echo # Connection default
+connection default;
+SET GLOBAL  debug= '';
+
+--echo # Test 3 - Active session trace file on disconnect
+--echo # Connection con1
+connect (con1, localhost, root);
+SET GLOBAL  debug= '+O,../../log/bug46165.3.trace';
+SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug= '';
+disconnect con1;
+--source include/wait_until_disconnected.inc
+
+--echo # Test 4 - Active session trace file on two connections
+--echo # Connection default
+connection default;
+SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
+SET SESSION debug= '-d:-t:-i';
+
+--echo # Connection con1
+connect (con1, localhost, root);
+SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug= '';
+SET SESSION debug= '';
+
+--echo # Connection default
+connection default;
+SET SESSION debug= '';
+--echo # Connection con1
+connection con1;
+disconnect con1;
+--source include/wait_until_disconnected.inc
+--echo # Connection default
+connection default;
+
+--echo # Test 5 - Different trace files
+SET SESSION debug= '+O,../../log/bug46165.5.trace';
+SET SESSION debug= '+O,../../log/bug46165.6.trace';
+SET SESSION debug= '-O';
+
+SET GLOBAL  debug= @old_globaldebug;
+SET SESSION debug= @old_sessiondebug;


Attachment: [text/bzr-bundle] bzr/jon.hauglid@oracle.com-20100929080756-6i7a2nvhh2vwvtml.bundle
Thread
bzr commit into mysql-5.5-runtime branch (jon.hauglid:3147) Bug#46165Jon Olav Hauglid29 Sep