5.2 merge

This commit is contained in:
Sergei Golubchik 2013-03-26 19:09:47 +01:00
commit e308d7417b
12 changed files with 171 additions and 125 deletions

View file

@ -13696,6 +13696,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
}
case Item::FIELD_ITEM:
case Item::DEFAULT_VALUE_ITEM:
case Item::INSERT_VALUE_ITEM:
{
Item_field *field= (Item_field*) item;
bool orig_modify= modify_item;