diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
commit | 31a8cf54c8a7913338480a0571feaf32143b5f64 (patch) | |
tree | 8847835f515af17d6c090300b138c31e1226731e /tests/mysql_client_fw.c | |
parent | 7b89b9f5108c80f4f270da922d7e6c182a663719 (diff) | |
download | mariadb-git-31a8cf54c8a7913338480a0571feaf32143b5f64.tar.gz |
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
Diffstat (limited to 'tests/mysql_client_fw.c')
-rw-r--r-- | tests/mysql_client_fw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index 50ecf6c0860..b7211989f1f 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -21,7 +21,6 @@ #include <my_getopt.h> #include <m_string.h> #include <mysqld_error.h> -#include <mysql_version.h> #include <sql_common.h> #include <mysql/client_plugin.h> @@ -364,7 +363,7 @@ static MYSQL* client_connect(ulong flag, uint protocol, my_bool auto_reconnect) fprintf(stdout, "\n Check the connection options using --help or -?\n"); exit(1); } - mysql_options(mysql, MYSQL_OPT_RECONNECT, &auto_reconnect); + mysql->reconnect= auto_reconnect; if (!opt_silent) fprintf(stdout, "OK"); @@ -1146,7 +1145,7 @@ static my_bool thread_query(const char *query) { MYSQL *l_mysql; my_bool error; - my_bool reconnect= 1; + error= 0; if (!opt_silent) fprintf(stdout, "\n in thread_query(%s)", query); @@ -1163,7 +1162,7 @@ static my_bool thread_query(const char *query) error= 1; goto end; } - mysql_options(l_mysql, MYSQL_OPT_RECONNECT, &reconnect); + l_mysql->reconnect= 1; if (mysql_query(l_mysql, query)) { fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql)); |