At file:///home/psergey/bzr-new/maria-5.1-merge-r3/
------------------------------------------------------------
revno: 2749
revision-id: psergey@askmonty.org-20091003190231-qqv8elhf8fs4ugxu
parent: knielsen@knielsen-hq.org-20091002125516-bf4k9g1c6nzincoc
parent: psergey@askmonty.org-20091003185654-ibglul7pqli0mei9
committer: Sergey Petrunya
branch nick: maria-5.1-merge-r3
timestamp: Sat 2009-10-03 23:02:31 +0400
message:
Merge
added:
mysql-test/r/variables_debug_notembedded.result variables_debug_note-20091003185522-fp0g3hek7so5aj4i-1
mysql-test/t/variables_debug_notembedded.test variables_debug_note-20091003185517-6myrmak03d4j3dlv-1
modified:
mysql-test/r/variables_debug.result sp1f-variables_debug.resu-20080226150357-xrpcjxbbb6lhnyicksx3a7ozn3i5wh5x
mysql-test/t/variables_debug.test sp1f-variables_debug.test-20080226150357-odgq22hsyfmfw7na43dwgeuppys77opf
------------------------------------------------------------
revno: 2745.1.1
revision-id: psergey@askmonty.org-20091003185654-ibglul7pqli0mei9
parent: psergey@askmonty.org-20091001212739-x4mzj5e7u8pig71f
committer: Sergey Petrunya
branch nick: mysql-5.1-maria-contd4
timestamp: Sat 2009-10-03 22:56:54 +0400
message:
Fix mysql-test-run --embedded:
- Don't run testcase for BUG#45632 with embedded server.
added:
mysql-test/r/variables_debug_notembedded.result variables_debug_note-20091003185522-fp0g3hek7so5aj4i-1
mysql-test/t/variables_debug_notembedded.test variables_debug_note-20091003185517-6myrmak03d4j3dlv-1
modified:
mysql-test/r/variables_debug.result sp1f-variables_debug.resu-20080226150357-xrpcjxbbb6lhnyicksx3a7ozn3i5wh5x
mysql-test/t/variables_debug.test sp1f-variables_debug.test-20080226150357-odgq22hsyfmfw7na43dwgeuppys77opf
=== modified file 'mysql-test/r/variables_debug.result'
--- a/mysql-test/r/variables_debug.result 2009-06-24 22:22:20 +0000
+++ b/mysql-test/r/variables_debug.result 2009-10-03 18:56:54 +0000
@@ -10,18 +10,3 @@
select @@debug;
@@debug
T
-set session debug="t";
-show session variables like 'debug';
-Variable_name Value
-debug t
-set session debug="t";
-show session variables like 'debug';
-Variable_name Value
-debug t
-set session debug="d:t";
-show session variables like 'debug';
-Variable_name Value
-debug d:t
-show session variables like 'debug';
-Variable_name Value
-debug t
=== added file 'mysql-test/r/variables_debug_notembedded.result'
--- a/mysql-test/r/variables_debug_notembedded.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/variables_debug_notembedded.result 2009-10-03 18:56:54 +0000
@@ -0,0 +1,15 @@
+set session debug="t";
+show session variables like 'debug';
+Variable_name Value
+debug t
+set session debug="t";
+show session variables like 'debug';
+Variable_name Value
+debug t
+set session debug="d:t";
+show session variables like 'debug';
+Variable_name Value
+debug d:t
+show session variables like 'debug';
+Variable_name Value
+debug t
=== modified file 'mysql-test/t/variables_debug.test'
--- a/mysql-test/t/variables_debug.test 2009-06-24 22:22:20 +0000
+++ b/mysql-test/t/variables_debug.test 2009-10-03 18:56:54 +0000
@@ -10,31 +10,3 @@
select @@debug;
set debug= '-P';
select @@debug;
-
-#
-# Checks that assigning variable 'debug' in one session has no influence on
-# other session. (BUG#45632 of bugs.mysql.com)
-#
-connect(con1,localhost,root,,test,,);
-connect(con2,localhost,root,,test,,);
-
-# makes output independant of current debug status
-connection con1;
-set session debug="t";
-show session variables like 'debug';
-connection con2;
-set session debug="t";
-show session variables like 'debug';
-
-# checks influence one session debug variable on another
-connection con1;
-set session debug="d:t";
-show session variables like 'debug';
-connection con2;
-show session variables like 'debug';
-
-disconnect con1;
-disconnect con2;
-
-connection default;
-
=== added file 'mysql-test/t/variables_debug_notembedded.test'
--- a/mysql-test/t/variables_debug_notembedded.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/variables_debug_notembedded.test 2009-10-03 18:56:54 +0000
@@ -0,0 +1,34 @@
+#
+# Checks that assigning variable 'debug' in one session has no influence on
+# other session. (BUG#45632 of bugs.mysql.com)
+#
+# (this will not work with embedded server because mysqltest_embedded uses the
+# same thread for all connections)
+#
+--source include/have_debug.inc
+--source include/not_embedded.inc
+
+connect(con1,localhost,root,,test,,);
+connect(con2,localhost,root,,test,,);
+
+# makes output independant of current debug status
+connection con1;
+set session debug="t";
+show session variables like 'debug';
+connection con2;
+set session debug="t";
+show session variables like 'debug';
+
+# checks influence one session debug variable on another
+connection con1;
+set session debug="d:t";
+show session variables like 'debug';
+connection con2;
+show session variables like 'debug';
+
+disconnect con1;
+disconnect con2;
+
+connection default;
+
+
Sergey Petrunya