Bug#21226 FLUSH PRIVILEGES does not provided feedback when it fails.
Post-merge fix: remove spurious semicolon that caused the function to return failure regardless of the outcome. sql/sql_parse.cc: Remove spurious semicolon.
This commit is contained in:
parent
2c933391f6
commit
130ab95a54
@ -6591,7 +6591,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
|
||||
if (lock_global_read_lock(thd))
|
||||
return 1; // Killed
|
||||
if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ?
|
||||
FALSE : TRUE, TRUE));
|
||||
FALSE : TRUE, TRUE))
|
||||
result= 1;
|
||||
|
||||
if (make_global_read_lock_block_commit(thd)) // Killed
|
||||
@ -6604,7 +6604,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
|
||||
else
|
||||
{
|
||||
if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ?
|
||||
FALSE : TRUE, FALSE));
|
||||
FALSE : TRUE, FALSE))
|
||||
result= 1;
|
||||
}
|
||||
my_dbopt_cleanup();
|
||||
|
Loading…
x
Reference in New Issue
Block a user