diff options
| author | unknown <davi@endora.local> | 2007-11-01 20:44:09 -0200 |
|---|---|---|
| committer | unknown <davi@endora.local> | 2007-11-01 20:44:09 -0200 |
| commit | 662f654917debb621cd8170a32115db153b95a84 (patch) | |
| tree | 44d296995c186a8a6852b549acd04c05eb98c7ce /sql/sql_parse.cc | |
| parent | b35ed7462da5497724eaaa057812f953fdfa95e8 (diff) | |
| parent | cba71f3e253fbe654bb570e60b43fd089faaddb1 (diff) | |
| download | mariadb-git-662f654917debb621cd8170a32115db153b95a84.tar.gz | |
Merge endora.local:/Users/davi/mysql/bugs/31850-5.1
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
sql/sql_connect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ea6a25d9866..34625f38c4e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -911,6 +911,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, /* Clear variables that are allocated */ thd->user_connect= 0; + thd->security_ctx->priv_user= thd->security_ctx->user; res= check_user(thd, COM_CHANGE_USER, passwd, passwd_len, db, FALSE); if (res) @@ -928,8 +929,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, if (save_user_connect) decrease_user_connections(save_user_connect); #endif /* NO_EMBEDDED_ACCESS_CHECKS */ - x_free((uchar*) save_db); - x_free((uchar*) save_security_ctx.user); + x_free(save_db); + x_free(save_security_ctx.user); if (cs_number) { |