diff options
author | Magnus Svensson <msvensson@mysql.com> | 2009-01-15 09:05:51 +0100 |
---|---|---|
committer | Magnus Svensson <msvensson@mysql.com> | 2009-01-15 09:05:51 +0100 |
commit | bb42e1ab05f9ebe166524d7d8a25c55a69e65dfa (patch) | |
tree | 15233f6fb7d4aebb9bc4e084ab8116c465b9616a /mysql-test | |
parent | d20aba9409a5cbd7b27df8ac9da31858b1bc5a84 (diff) | |
download | mariadb-git-bb42e1ab05f9ebe166524d7d8a25c55a69e65dfa.tar.gz |
Bug#35701 please allow test language variables in connection and
sync_slave_with_master
- Additional patch for "disconnect $variable"
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/mysqltest.result | 10 | ||||
-rw-r--r-- | mysql-test/t/mysqltest.test | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 567dd33f0fc..1a65f90bd65 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -153,8 +153,12 @@ mysqltest: At line 1: Missing delimiter mysqltest: At line 1: End of line junk detected: "sleep 7 # Another comment " -mysqltest: At line 1: Missing delimiter -mysqltest: At line 1: Missing delimiter +mysqltest: At line 1: Extra argument 'comment +# comment 3 +disable_query_log' passed to 'disconnect' +mysqltest: At line 1: Extra argument 'comment +# comment 3 +disable_query_log' passed to 'disconnect' mysqltest: At line 1: End of line junk detected: "disconnect default # @@ -745,4 +749,6 @@ default con1 default con1 +con1 +-closed_connection- End of tests diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index ba3f2f5da5e..6c5efba8b5b 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2206,6 +2206,14 @@ connection $x; connection $y; --echo $CURRENT_CONNECTION +# Disconnect the not selected connection +disconnect $x; +--echo $CURRENT_CONNECTION + +# Disconnect the selected connection +disconnect $y; +--echo $CURRENT_CONNECTION + --echo End of tests |