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

A small simplification: perform two actions at once, register a

Browse Source 
change, and perform it (the new Item changes registry).
This commit is contained in:
konstantin@mysql.com
2004-10-10 03:10:00 +04:00
parent e08febea0c
commit 703e396b6e
7 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_select.cc
View File

@ -4203,8 +4203,7 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list,
Item *tmp=value->new_item();
if (tmp)
{
thd->register_item_tree_change(args + 1, args[1], &thd->mem_root);
args[1]= tmp;
thd->change_item_tree(args + 1, tmp);
func->update_used_tables();
if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC)
&& and_father != cond && !left_item->const_item())
@ -4225,15 +4224,14 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list,
Item *tmp=value->new_item();
if (tmp)
{
thd->register_item_tree_change(args, args[0], &thd->mem_root);
args[0]= value= tmp;
thd->change_item_tree(args, tmp);
value= tmp;
func->update_used_tables();
if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC)
&& and_father != cond && !right_item->const_item())
{
args[0]= args[1]; // For easy check
thd->register_item_tree_change(args + 1, args[1], &thd->mem_root);
args[1]= value;
thd->change_item_tree(args + 1, value);
cond->marker=1;
COND_CMP *tmp2;
if ((tmp2=new COND_CMP(and_father,func)))
@ -4959,8 +4957,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
*blob_field++= new_field;
blob_count++;
}
thd->register_item_tree_change(argp, arg, &thd->mem_root);
*argp= new Item_field(new_field);
thd->change_item_tree(argp, new Item_field(new_field));
if (!(new_field->flags & NOT_NULL_FLAG))
{
null_count++;