diff options
| author | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
| commit | 6bc9bc92df57f1cc586e2223e23c0e94003fa7eb (patch) | |
| tree | df4c92bcf5668ec88685604378ad6dc60bfcf269 /sql/sql_base.cc | |
| parent | 3f72507d0d9e935b0a6badcf20c0dbff06860658 (diff) | |
| parent | c53037af36e1e7af2996299fc6f0d126619f2565 (diff) | |
| download | mariadb-git-6bc9bc92df57f1cc586e2223e23c0e94003fa7eb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
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 8cc54aa3c8c..7dff4c78c27 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); @@ -6486,7 +6486,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; |