summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorantony@ppcg5.local <>2007-03-02 08:43:45 -0800
committerantony@ppcg5.local <>2007-03-02 08:43:45 -0800
commitdc24473cb20a13b8af79aa8327b0e0fb253ff239 (patch)
tree23fe49e9ab83f6badb4e173587f9e194490a3859 /sql/sql_base.cc
parent83a5eac0a43dfd7ca4ac4d01926c4dfc668a46e4 (diff)
downloadmariadb-git-dc24473cb20a13b8af79aa8327b0e0fb253ff239.tar.gz
WL#2936
"Server Variables for Plugins" Implement support for plugins to declare server variables. Demonstrate functionality by removing InnoDB specific code from sql/* New feature for HASH - HASH_UNIQUE flag New feature for DYNAMIC_ARRAY - initializer accepts preallocated ptr. Completed support for plugin reference counting.
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 15d616bdd4f..131e7c66557 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1596,7 +1596,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);
@@ -6186,7 +6186,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;