diff options
| author | serg@serg.mylan <> | 2004-08-26 18:22:22 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-08-26 18:22:22 +0200 |
| commit | 08f3ba0e29aefb9aae54534fcd9f799eccf8ffc6 (patch) | |
| tree | 3e3e91346cc6f95a8628a4dbaaacb94646c02511 /sql/item_row.cc | |
| parent | 5633414c8fe3ad9630f75c1d6fd8d78596c6ab8e (diff) | |
| download | mariadb-git-08f3ba0e29aefb9aae54534fcd9f799eccf8ffc6.tar.gz | |
after merge
Diffstat (limited to 'sql/item_row.cc')
| -rw-r--r-- | sql/item_row.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index c7e4bc0acf4..f6623e80734 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -66,7 +66,8 @@ bool Item_row::fix_fields(THD *thd, TABLE_LIST *tabl, Item **ref) // we can't assign 'item' before, because fix_fields() can change arg Item *item= *arg; used_tables_cache |= item->used_tables(); - if (const_item_cache&= item->const_item() && !with_null) + const_item_cache&= item->const_item() && !with_null; + if (const_item_cache) { if (item->cols() > 1) with_null|= item->null_inside(); |