Merge from bugteam trunk.

b37814ef · Chad MILLER · 9d2e311b · 130ab95a · b37814ef
Commit b37814ef authored Aug 07, 2008 by Chad MILLER
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- 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();