diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-04 00:48:40 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-04 00:48:40 +0300 |
| commit | f30d17e078dab10c8beded9a1c9b476dd4c67be9 (patch) | |
| tree | 737674a83beb16e444848c8c4a66a3de08696065 /sql/sql_base.cc | |
| parent | 1397985d53b575ed51b51568a12695949ab00698 (diff) | |
| parent | b6685d35dcc45e4fc8eca53fa8f6d3315f2e6b89 (diff) | |
| download | mariadb-git-f30d17e078dab10c8beded9a1c9b476dd4c67be9.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 8333f0a03c7..ad65e0abfe9 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -122,10 +122,6 @@ static bool check_and_update_table_version(THD *thd, TABLE_LIST *tables, static bool open_table_entry_fini(THD *thd, TABLE_SHARE *share, TABLE *entry); static bool auto_repair_table(THD *thd, TABLE_LIST *table_list); static void free_cache_entry(TABLE *entry); -static bool open_new_frm(THD *thd, TABLE_SHARE *share, const char *alias, - uint db_stat, uint prgflag, - uint ha_open_flags, TABLE *outparam, - TABLE_LIST *table_desc, MEM_ROOT *mem_root); static bool tdc_wait_for_old_versions(THD *thd, MDL_request_list *mdl_requests); static bool @@ -8784,7 +8780,7 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order) mem_root temporary MEM_ROOT for parsing */ -static bool +bool open_new_frm(THD *thd, TABLE_SHARE *share, const char *alias, uint db_stat, uint prgflag, uint ha_open_flags, TABLE *outparam, TABLE_LIST *table_desc, |