database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

lots of post-merge changes

Browse Source
This commit is contained in:
Sergei Golubchik
2011-04-25 17:22:25 +02:00
parent 37f87d73ae
commit 0accbd0364
738 changed files with 9206 additions and 10972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_expression_cache.cc
View File

@ -1,6 +1,7 @@
#include "mysql_priv.h"
#include "sql_base.h"
#include "sql_select.h"
#include "sql_expression_cache.h"
/*
Expression cache is used only for caching subqueries now, so its statistic
@ -91,10 +92,9 @@ void Expression_cache_tmptable::init()
if (!(cache_table= create_tmp_table(table_thd, &cache_table_param,
items, (ORDER*) NULL,
FALSE, FALSE,
((table_thd->options |
((table_thd->variables.option_bits |
TMP_TABLE_ALL_COLUMNS) &
~(OPTION_BIG_TABLES |
TMP_TABLE_FORCE_MYISAM)),
~TMP_TABLE_FORCE_MYISAM),
HA_POS_ERROR,
(char *)"subquery-cache-table")))
{
@ -155,7 +155,10 @@ error:
Expression_cache_tmptable::~Expression_cache_tmptable()
{
if (cache_table)
{
cache_table->file->ha_index_end();
free_tmp_table(table_thd, cache_table);
}
}
@ -253,6 +256,7 @@ my_bool Expression_cache_tmptable::put_value(Item *value)
DBUG_RETURN(FALSE);
err:
cache_table->file->ha_index_end();
free_tmp_table(table_thd, cache_table);
cache_table= NULL;
DBUG_RETURN(TRUE);