bzr commit into mysql-5.1 branch (chad:2687) Bug#21226

[Chad MILLER]

#At file:///home/cmiller/work/mysqlbzr/mysql-5.1-bugteam/

 2687 Chad MILLER	2008-08-07 [merge]
      Merge from bugteam trunk.
modified:
  sql/sql_parse.cc

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2008-08-06 14:20:41 +0000
+++ b/sql/sql_parse.cc	2008-08-07 02:23:58 +0000
@@ -6591,7 +6591,7 @@ bool reload_acl_and_cache(THD *thd, ulon
       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, ulon
     else
     {
       if (close_cached_tables(thd, tables, FALSE, (options & REFRESH_FAST) ?
-                              FALSE : TRUE, FALSE));
+                              FALSE : TRUE, FALSE))
         result= 1;
     }
     my_dbopt_cleanup();