From f5b5e6b951eabe6d6add84fa915d305a4a95cddf Mon Sep 17 00:00:00 2001 From: Ashish Agarwal Date: Tue, 2 Jul 2013 11:58:39 +0530 Subject: WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 Backporting wl6715 to mysql-5.5 --- sql/sql_insert.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql/sql_insert.cc') diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 94f4403d02e..8dc56965749 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1893,7 +1893,7 @@ public: { DBUG_ENTER("Delayed_insert constructor"); thd.security_ctx->user=(char*) delayed_user; - thd.security_ctx->host=(char*) my_localhost; + thd.security_ctx->set_host(my_localhost); strmake(thd.security_ctx->priv_user, thd.security_ctx->user, USERNAME_LENGTH); thd.current_tablenr=0; @@ -1939,7 +1939,8 @@ public: mysql_cond_destroy(&cond_client); thd.unlink(); // Must be unlinked under lock my_free(thd.query()); - thd.security_ctx->user= thd.security_ctx->host=0; + thd.security_ctx->set_host(""); + thd.security_ctx->user= (char *) thd.security_ctx->get_host()->ptr(); thread_count--; delayed_insert_threads--; mysql_mutex_unlock(&LOCK_thread_count); -- cgit v1.2.1