diff options
| author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
|---|---|---|
| committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
| commit | f5b5e6b951eabe6d6add84fa915d305a4a95cddf (patch) | |
| tree | e923a916e758c6cde635765b285649506d0fe00a /sql/sql_insert.cc | |
| parent | 3ee4a82fd1b3f886c027f0144bdce260b721c5a1 (diff) | |
| download | mariadb-git-f5b5e6b951eabe6d6add84fa915d305a4a95cddf.tar.gz | |
WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7
Backporting wl6715 to mysql-5.5
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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); |