1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

post-merge fixes.

most tests pass.
5.3 merge is next
This commit is contained in:
Sergei Golubchik
2011-07-02 22:12:12 +02:00
parent 9809f05199
commit b4a0b2c2f8
221 changed files with 2070 additions and 1880 deletions

View File

@@ -977,7 +977,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
MYSQL_AUDIT_NOTIFY_CONNECTION_CHANGE_USER(thd);
if (rc)
{
my_free(thd->security_ctx->user);
/* authentication can fail before or after allocating new username */
if (thd->security_ctx->user != save_security_ctx.user)
my_free(thd->security_ctx->user);
*thd->security_ctx= save_security_ctx;
thd->user_connect= save_user_connect;
thd->reset_db(save_db, save_db_length);