Commit e01cac7d authored by Davi Arnaut's avatar Davi Arnaut

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.
parent 297593c5
...@@ -6591,7 +6591,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, ...@@ -6591,7 +6591,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
if (lock_global_read_lock(thd)) if (lock_global_read_lock(thd))
return 1; // Killed return 1; // Killed
if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ? if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ?
FALSE : TRUE, TRUE)); FALSE : TRUE, TRUE))
result= 1; result= 1;
if (make_global_read_lock_block_commit(thd)) // Killed 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, ...@@ -6604,7 +6604,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
else else
{ {
if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ? if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ?
FALSE : TRUE, FALSE)); FALSE : TRUE, FALSE))
result= 1; result= 1;
} }
my_dbopt_cleanup(); my_dbopt_cleanup();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment