summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorSven Sandberg <sven@mysql.com>2008-10-23 16:23:13 +0200
committerSven Sandberg <sven@mysql.com>2008-10-23 16:23:13 +0200
commitc7f8ffe7a7d0ef7d046a5f67c1278faf6c0f7e5d (patch)
tree8af8b0d3058011dedc248622d77525d46d0bb661 /mysql-test/r/mysqltest.result
parent3be6d967c5d04fa6dbeab1c25f28673d3abf8433 (diff)
downloadmariadb-git-c7f8ffe7a7d0ef7d046a5f67c1278faf6c0f7e5d.tar.gz
BUG#35701: please allow test language variables in connection and sync_slave_with_master
Problem: In the mysqltest language, it was not possible to set the current connection from a variable, and it was not possible to read the current connection. Fix: Allow setting the connection from a variable, like: connection $variable; and introduce the mysqltest language variable $CURRENT_CONNECTION, which holds the name of the current connection. client/mysqltest.cc: - Made select_connection use the common argument parser instead of its own home-rolled version. That allows variable expansion, for instance. - Made select_connection_name set the variable $CURRENT_CONNECTION, so that test scripts can use that. - Refactored a bit so that stuff that needs to be done when changing connection is located to one place. mysql-test/t/mysqltest.test: Added test case for $CURRENT_CONNECTION and "connection $variable"
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 8fb53360cc8..567dd33f0fc 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -740,4 +740,9 @@ select 1;
1
-- a comment for the server;
mysqltest: At line 1: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment
+con1
+default
+con1
+default
+con1
End of tests