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

Fix for LP bug#611625: Removing NULL references from subquery parameter list added.

Browse Source 
Incorrect limitation on number of parameters removed.

mysql-test/r/subselect_cache.result:
  Test suite added.
mysql-test/t/subselect_cache.test:
  Test suite added.
sql/sql_class.h:
  Iterator changed.
sql/sql_expression_cache.cc:
  Incorrect limitation removed.
  Removing NULL references from subquery parameter list added.
This commit is contained in:
unknown
2010-08-09 13:00:58 +03:00
parent 26148735a0
commit 4cf6b18b03
4 changed files with 386 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_expression_cache.cc
View File

@ -96,21 +96,38 @@ static uint field_enumerator(uchar *arg)
void Expression_cache_tmptable::init()
{
List_iterator_fast<Item*> li(*list);
List_iterator<Item*> li(*list);
Item_iterator_ref_list it(li);
Item **item;
uint field_counter;
DBUG_ENTER("Expression_cache_tmptable::init");
DBUG_ASSERT(!inited);
inited= TRUE;
cache_table= NULL;
if (!(ULONGLONG_MAX >> (list->elements + 1)))
while ((item= li++))
{
DBUG_PRINT("info", ("Too many dependencies"));
DBUG_VOID_RETURN;
DBUG_ASSERT(item);
if (*item)
{
DBUG_ASSERT((*item)->fixed);
items.push_back((*item));
}
else
{
/*
This is possible when optimizer already executed this subquery and
optimized out the condition predicate.
*/
li.remove();
}
}
cache_table= NULL;
if (list->elements == 0)
{
DBUG_PRINT("info", ("All parameters were removed by optimizer."));
DBUG_VOID_RETURN;
}
cache_table_param.init();
/* dependent items and result */
@ -119,13 +136,6 @@ void Expression_cache_tmptable::init()
cache_table_param.skip_create_table= 1;
cache_table= NULL;
while ((item= li++))
{
DBUG_ASSERT(item);
DBUG_ASSERT(*item);
DBUG_ASSERT((*item)->fixed);
items.push_back((*item));
}
items.push_front(val);
if (!(cache_table= create_tmp_table(table_thd, &cache_table_param,