diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
commit | 38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch) | |
tree | b33dfb00e00ec3f4473c088305871021f437ee46 /sql/sql_insert.cc | |
parent | 623ed1946215e25682847ac3b0ea066cab35ea59 (diff) | |
parent | 052c9e392e6d9b770511c88cfec05ef606bff2ed (diff) | |
download | mariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index cccb715bd5e..3ac6cf28c90 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1896,8 +1896,10 @@ public: status(0), handler_thread_initialized(FALSE), group_count(0) { DBUG_ENTER("Delayed_insert constructor"); - thd.security_ctx->user=thd.security_ctx->priv_user=(char*) delayed_user; + thd.security_ctx->user=(char*) delayed_user; thd.security_ctx->host=(char*) my_localhost; + strmake(thd.security_ctx->priv_user, thd.security_ctx->user, + USERNAME_LENGTH); thd.current_tablenr=0; thd.command=COM_DELAYED_INSERT; thd.lex->current_select= 0; // for my_message_sql |