From e01cac7d89492e3d7cd64e32a79e359b5b13cd89 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Wed, 6 Aug 2008 23:23:58 -0300 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8857b09b24b..d9ec8f6c610 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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();