From: Jon Olav Hauglid Date: September 29 2010 8:07am Subject: bzr commit into mysql-5.5-runtime branch (jon.hauglid:3147) Bug#46165 List-Archive: http://lists.mysql.com/commits/119349 X-Bug: 46165 Message-Id: <201009290809.o8SNaeb8028141@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7401869781227687356==" --===============7401869781227687356== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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; --===============7401869781227687356== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jon.hauglid@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@stripped # target_branch: file:///export/home/x/mysql-5.5-runtime-test/ # testament_sha1: ccec34bd2f6fbbb5472ad955e9bbea119e7cb0ee # timestamp: 2010-09-29 10:08:00 +0200 # source_branch: file:///export/home/x/mysql-5.5-bugfixing/ # base_revision_id: jon.hauglid@stripped\ # 181jm9k743tznuuo # # Begin bundle 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 97S2co+TWyHkKDo4fxdyRThQkLRIFO4= --===============7401869781227687356==--