diff options
| author | acurtis/antony@ltamd64.xiphis.org <> | 2007-05-04 23:35:14 -0700 |
|---|---|---|
| committer | acurtis/antony@ltamd64.xiphis.org <> | 2007-05-04 23:35:14 -0700 |
| commit | a4dbc0990cc2f89a1b7f256f6d1d838f25f070c4 (patch) | |
| tree | 56b4a36694de3fd3fdb494ae00d38cd3f38d7c3d /sql/sql_base.cc | |
| parent | 5558019733b64303837c6428a215d69f21bdf971 (diff) | |
| parent | 0f0ef2fe14dd3082808b767abb6a995f255183c5 (diff) | |
| download | mariadb-git-a4dbc0990cc2f89a1b7f256f6d1d838f25f070c4.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f26d6e5777b..019caa051d6 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1716,7 +1716,7 @@ void close_temporary_table(THD *thd, TABLE *table, void close_temporary(TABLE *table, bool free_share, bool delete_table) { - handlerton *table_type= table->s->db_type; + handlerton *table_type= table->s->db_type(); DBUG_ENTER("close_temporary"); free_io_cache(table); @@ -6512,7 +6512,7 @@ my_bool mysql_rm_tmp_tables(void) init_tmp_table_share(&share, "", 0, "", filePathCopy); if (!open_table_def(thd, &share, 0) && ((handler_file= get_new_handler(&share, thd->mem_root, - share.db_type)))) + share.db_type())))) { handler_file->delete_table(filePathCopy); delete handler_file; |