From 2eaa6352e93b3b011be4c643d534b39a9fc8bf76 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Tue, 20 Nov 2007 15:46:33 +0400
Subject: merging

---
 sql/mysql_priv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/mysql_priv.h')

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index b5f0fa3a678..d58e3ae58ed 100644
--- 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);
-- 
cgit v1.2.1