summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-05-18 09:50:30 -0700
committerIgor Babaev <igor@askmonty.org>2012-05-18 09:50:30 -0700
commitd48b4a83a28750ccd9364e8e68ba5bfb9221858b (patch)
treeb464c088716907ab8f697f7668c93e092e35b069 /sql/sql_base.h
parent9b79feba56d8b0f955447afddbc4ab8b1d4d33c1 (diff)
parent8e95e6543b629e67e68974b8657ecfda0ba29c8a (diff)
downloadmariadb-git-d48b4a83a28750ccd9364e8e68ba5bfb9221858b.tar.gz
Merge.
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 203f8c18e14..44d107376b0 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -292,7 +292,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
bool wait_for_refresh, ulong timeout);
bool close_cached_connection_tables(THD *thd, LEX_STRING *connect_string);
void close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
- bool remove_from_locked_tables);
+ ha_extra_function extra);
OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild);
void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
const char *db, const char *table_name,