summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 22:50:45 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 22:50:45 +0200
commit42b8235788f7556fef1295dc281a29da4afe0f7d (patch)
treed3eff679ca6e85c187aa26218c78e89e3e4710d3 /client
parent533d274c03fe424dacfb9e119ea5f98799373b73 (diff)
downloadmariadb-git-42b8235788f7556fef1295dc281a29da4afe0f7d.tar.gz
cleanups
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 3381c4f116d..23b9eb578c6 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -886,6 +886,7 @@ static void init_connection_thd(struct st_connection *cn)
#else /*EMBEDDED_LIBRARY*/
+#define init_connection_thd(X) do { } while(0)
#define do_send_query(cn,q,q_len) mysql_send_query(cn->mysql, q, q_len)
#define do_read_query_result(cn) mysql_read_query_result(cn->mysql)
@@ -5487,9 +5488,7 @@ void do_connect(struct st_command *command)
con_slot->name= 0;
}
-#ifdef EMBEDDED_LIBRARY
init_connection_thd(con_slot);
-#endif /*EMBEDDED_LIBRARY*/
if (!(con_slot->mysql= mysql_init(0)))
die("Failed on mysql_init()");
@@ -8470,9 +8469,7 @@ int main(int argc, char **argv)
cursor_protocol_enabled= cursor_protocol;
st_connection *con= connections;
-#ifdef EMBEDDED_LIBRARY
init_connection_thd(con);
-#endif /*EMBEDDED_LIBRARY*/
if (! (con->mysql= mysql_init(0)))
die("Failed in mysql_init()");
if (opt_connect_timeout)