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

Move tmp_table_used to THD

Browse Source 
Optimize depending sub querys
Remove valgrind warnings
This commit is contained in:
monty@mashka.mysql.fi
2003-02-10 17:59:16 +02:00
parent aee7346ec1
commit 48558055ed
19 changed files with 239 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_select.cc
View File

@ -1902,9 +1902,10 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
case Item_func::OPTIMIZE_NONE:
break;
case Item_func::OPTIMIZE_KEY:
if (cond_func->key_item()->type() == Item::FIELD_ITEM)
if (cond_func->key_item()->real_item()->type() == Item::FIELD_ITEM)
add_key_field(key_fields,*and_level,
((Item_field*) (cond_func->key_item()))->field,
((Item_field*) (cond_func->key_item()->real_item()))
->field,
0,(Item*) 0,usable_tables);
break;
case Item_func::OPTIMIZE_OP:
@ -1912,18 +1913,20 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
bool equal_func=(cond_func->functype() == Item_func::EQ_FUNC ||
cond_func->functype() == Item_func::EQUAL_FUNC);
if (cond_func->arguments()[0]->type() == Item::FIELD_ITEM)
if (cond_func->arguments()[0]->real_item()->type() == Item::FIELD_ITEM)
{
add_key_field(key_fields,*and_level,
((Item_field*) (cond_func->arguments()[0]))->field,
((Item_field*) (cond_func->arguments()[0])->real_item())
->field,
equal_func,
(cond_func->arguments()[1]),usable_tables);
}
if (cond_func->arguments()[1]->type() == Item::FIELD_ITEM &&
if (cond_func->arguments()[1]->real_item()->type() == Item::FIELD_ITEM &&
cond_func->functype() != Item_func::LIKE_FUNC)
{
add_key_field(key_fields,*and_level,
((Item_field*) (cond_func->arguments()[1]))->field,
((Item_field*) (cond_func->arguments()[1])->real_item())
->field,
equal_func,
(cond_func->arguments()[0]),usable_tables);
}
@ -1931,10 +1934,11 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
}
case Item_func::OPTIMIZE_NULL:
/* column_name IS [NOT] NULL */
if (cond_func->arguments()[0]->type() == Item::FIELD_ITEM)
if (cond_func->arguments()[0]->real_item()->type() == Item::FIELD_ITEM)
{
add_key_field(key_fields,*and_level,
((Item_field*) (cond_func->arguments()[0]))->field,
((Item_field*) (cond_func->arguments()[0])->real_item())
->field,
cond_func->functype() == Item_func::ISNULL_FUNC,
new Item_null, usable_tables);
}