1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#57098 RBR breaks on changing user password on 5.1 master -> 5.5 slave

Browse Source 
Backported the patch for BUG#55452.
This commit is contained in:
Alfranio Correia 2010-10-06 11:19:51 +01:00
parent 58995280cc
commit 361833796f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_acl.cc
View File

@ -1593,6 +1593,7 @@ bool change_password(THD *thd, const char *host, const char *user,
/* Buffer should be extended when password length is extended. */
char buff[512];
ulong query_length;
bool save_binlog_row_based;
uint new_password_len= (uint) strlen(new_password);
bool result= 1;
DBUG_ENTER("change_password");
@ -1628,6 +1629,14 @@ bool change_password(THD *thd, const char *host, const char *user,
if (!(table= open_ltable(thd, &tables, TL_WRITE, 0)))
DBUG_RETURN(1);
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
statement.
*/
if ((save_binlog_row_based= thd->current_stmt_binlog_row_based))
thd->clear_current_stmt_binlog_row_based();
VOID(pthread_mutex_lock(&acl_cache->lock));
ACL_USER *acl_user;
if (!(acl_user= find_acl_user(host, user, TRUE)))
@ -1663,6 +1672,12 @@ bool change_password(THD *thd, const char *host, const char *user,
}
end:
close_thread_tables(thd);
/* Restore the state of binlog format */
DBUG_ASSERT(!thd->current_stmt_binlog_row_based);
if (save_binlog_row_based)
thd->set_current_stmt_binlog_row_based();
DBUG_RETURN(result);
}