merging

1441d6d0 · holyfoot/hf@mysql.com/hfmain.(none) · aa12d49b · 1441d6d0
Commit 1441d6d0 authored Nov 20, 2007 by holyfoot/hf@mysql.com/hfmain.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/mysql_priv.h sql/mysql_priv.h +1 -1

No files found.
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -679,7 +679,7 @@ extern my_decimal decimal_zero;
 void free_items(Item *item);
 void cleanup_items(Item *item);
 class THD;
-void close_thread_tables(THD *thd, bool locked=0, bool skip_derived=0);
+void close_thread_tables(THD *thd);

 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *tables);