summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-15 03:55:48 +0200
committerunknown <monty@donna.mysql.fi>2001-03-15 03:55:48 +0200
commit41ed01413fdfcfa8bec77c8ebd1a6850feb04463 (patch)
tree07b5e02de968248c9c9cf63912c2416cb016c45f /client
parent68414519cb85f346fc04a169f390a33c46f0b0d0 (diff)
downloadmariadb-git-41ed01413fdfcfa8bec77c8ebd1a6850feb04463.tar.gz
Added fix for using variables with distinct
Docs/manual.texi: Updated links client/mysqltest.c: Added 'ping' method configure.in: Upgraded version number mysql-test/r/user_var.result: Added test for using variables with distinct mysql-test/t/kill.test: Use 'ping' to force reconnect mysql-test/t/user_var.test: Added test for using variables with distinct sql-bench/run-all-tests.sh: Fixed argument passing
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 9e50fb064cb..d38bf40a678 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -43,7 +43,7 @@
**********************************************************************/
-#define MTEST_VERSION "1.6"
+#define MTEST_VERSION "1.7"
#include <global.h>
#include <my_sys.h>
@@ -156,6 +156,7 @@ struct st_query
Q_SYNC_WITH_MASTER, Q_ERROR,
Q_SEND, Q_REAP,
Q_DIRTY_CLOSE, Q_REPLACE,
+ Q_PING,
Q_UNKNOWN, /* Unknown command. */
Q_COMMENT, /* Comments, ignored. */
Q_COMMENT_WITH_COMMAND
@@ -174,6 +175,7 @@ const char *command_names[] = {
"sync_with_master", "error",
"send", "reap",
"dirty_close", "replace_result",
+ "ping",
0
};
@@ -1662,6 +1664,9 @@ int main(int argc, char** argv)
case Q_SYNC_WITH_MASTER: do_sync_with_master(q); break;
case Q_COMMENT: /* Ignore row */
case Q_COMMENT_WITH_COMMAND:
+ case Q_PING:
+ (void) mysql_ping(&cur_con->mysql);
+ break;
default: processed = 0; break;
}
}