5.1-bugteam->5.5-bugteam merge

This commit is contained in:
Sergey Glukhov 2010-12-14 13:46:00 +03:00
commit e6bf102466
24 changed files with 153 additions and 83 deletions

View file

@ -80,12 +80,8 @@ bool Item_row::fix_fields(THD *thd, Item **ref)
used_tables_cache |= item->used_tables();
const_item_cache&= item->const_item() && !with_null;
not_null_tables_cache|= item->not_null_tables();
/*
Some subqueries transformations aren't done in the view_prepare_mode thus
is_null() will fail. So we skip is_null() calculation for CREATE VIEW as
not necessary.
*/
if (const_item_cache && !thd->lex->view_prepare_mode)
if (const_item_cache)
{
if (item->cols() > 1)
with_null|= item->null_inside();