database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanups done as part of adding encryption

Browse Source 
- Fixed compiler warnings
- Added include/wait_for_binlog_checkpoint.inc, as suggested by JonasO
- Updated 'build-tags' to work with git (Patch by Serg)
This commit is contained in:
Monty
2014-12-22 02:02:38 +02:00
committed by Sergei Golubchik
parent 01963e5df1
commit 3a3ec744b5
9 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_acl.cc
View File

@ -2763,12 +2763,20 @@ bool change_password(THD *thd, LEX_USER *user)
enum_binlog_format save_binlog_format;
int result=0;
const CSET_STRING query_save __attribute__((unused)) = thd->query_string;
DBUG_ENTER("change_password");
DBUG_PRINT("enter",("host: '%s' user: '%s' new_password: '%s'",
user->host.str, user->user.str, user->password.str));
DBUG_ASSERT(user->host.str != 0); // Ensured by parent
/*
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.
This has to be handled here as it's called by set_var.cc, which is
not automaticly handled by sql_parse.cc
*/
save_binlog_format= thd->set_current_stmt_binlog_format_stmt();
if (mysql_bin_log.is_open() ||
(WSREP(thd) && !IF_WSREP(thd->wsrep_applier, 0)))
{
@ -2788,15 +2796,6 @@ bool change_password(THD *thd, LEX_USER *user)
result= 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.
This has to be handled here as it's called by set_var.cc, which is
not automaticly handled by sql_parse.cc
*/
save_binlog_format= thd->set_current_stmt_binlog_format_stmt();
mysql_mutex_lock(&acl_cache->lock);
ACL_USER *acl_user;
if (!(acl_user= find_user_exact(user->host.str, user->user.str)))
@ -2842,7 +2841,7 @@ end:
close_mysql_tables(thd);
#ifdef WITH_WSREP
error: // this label is used in WSREP_TO_ISOLATION_END
error: // this label is used in WSREP_TO_ISOLATION_BEGIN
if (WSREP(thd) && !thd->wsrep_applier)
{
WSREP_TO_ISOLATION_END;