mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
basic row Items (SCRUM)
include/mysql_com.h: basic row Items include/mysqld_error.h: more wide error mening libmysqld/Makefile.am: basic row Items mysql-test/r/subselect.result: more wide error mening sql/Makefile.am: basic row Items sql/filesort.cc: basic row Items sql/item.cc: basic row Items sql/item.h: basic row Items sql/item_cmpfunc.cc: basic row Items sql/item_cmpfunc.h: basic row Items sql/item_func.cc: basic row Items sql/item_func.h: basic row Items sql/item_strfunc.cc: basic row Items sql/item_strfunc.h: basic row Items sql/item_subselect.cc: basic row Items sql/item_sum.cc: basic row Items sql/share/czech/errmsg.txt: more wide error mening sql/share/danish/errmsg.txt: more wide error mening sql/share/dutch/errmsg.txt: more wide error mening sql/share/english/errmsg.txt: more wide error mening sql/share/estonian/errmsg.txt: more wide error mening sql/share/french/errmsg.txt: more wide error mening sql/share/german/errmsg.txt: more wide error mening sql/share/greek/errmsg.txt: more wide error mening sql/share/hungarian/errmsg.txt: more wide error mening sql/share/italian/errmsg.txt: more wide error mening sql/share/japanese/errmsg.txt: more wide error mening sql/share/korean/errmsg.txt: more wide error mening sql/share/norwegian-ny/errmsg.txt: more wide error mening sql/share/norwegian/errmsg.txt: more wide error mening sql/share/polish/errmsg.txt: more wide error mening sql/share/portuguese/errmsg.txt: more wide error mening sql/share/romanian/errmsg.txt: more wide error mening sql/share/russian/errmsg.txt: more wide error mening sql/share/serbian/errmsg.txt: more wide error mening sql/share/slovak/errmsg.txt: more wide error mening sql/share/spanish/errmsg.txt: more wide error mening sql/share/swedish/errmsg.txt: more wide error mening sql/share/ukrainian/errmsg.txt: more wide error mening sql/sql_base.cc: fix_fields error handling sql/sql_lex.cc: basic row Items sql/sql_select.cc: basic row Items sql/sql_yacc.yy: basic row Items
This commit is contained in:
@ -3317,8 +3317,7 @@ change_cond_ref_to_const(I_List<COND_CMP> *save_list,Item *and_father,
|
||||
if ((tmp2=new COND_CMP(and_father,func)))
|
||||
save_list->push_back(tmp2);
|
||||
}
|
||||
func->set_cmp_func(item_cmp_type(func->arguments()[0]->result_type(),
|
||||
func->arguments()[1]->result_type()));
|
||||
func->set_cmp_func(func->arguments()[0],func->arguments()[1]);
|
||||
}
|
||||
}
|
||||
else if (left_item->eq(field,0) && right_item != value)
|
||||
@ -3338,8 +3337,7 @@ change_cond_ref_to_const(I_List<COND_CMP> *save_list,Item *and_father,
|
||||
if ((tmp2=new COND_CMP(and_father,func)))
|
||||
save_list->push_back(tmp2);
|
||||
}
|
||||
func->set_cmp_func(item_cmp_type(func->arguments()[0]->result_type(),
|
||||
func->arguments()[1]->result_type()));
|
||||
func->set_cmp_func(func->arguments()[0], func->arguments()[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3679,6 +3677,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
|
||||
item->name,table,item->charset());
|
||||
return new Field_string(item_sum->max_length,maybe_null,
|
||||
item->name,table,item->charset());
|
||||
case ROW_RESULT:
|
||||
// This case should never be choosen
|
||||
DBUG_ASSERT(0);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
thd->fatal_error=1;
|
||||
@ -3735,6 +3737,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
|
||||
new_field= new Field_string(item->max_length,maybe_null,
|
||||
item->name,table,item->str_value.charset());
|
||||
break;
|
||||
case ROW_RESULT:
|
||||
// This case should never be choosen
|
||||
DBUG_ASSERT(0);
|
||||
break;
|
||||
}
|
||||
if (copy_func)
|
||||
*((*copy_func)++) = (Item_result_field*) item; // Save for copy_funcs
|
||||
|
Reference in New Issue
Block a user