diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
| commit | b170b126b02c2989e68694d6781fb48d4f316363 (patch) | |
| tree | bfc039f3ee09098fe5df5082ba6aaea56ebac313 /sql/item_cmpfunc.cc | |
| parent | 41e66d57d5898ea2fa38dfb3a6b47de876efd3c9 (diff) | |
| parent | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (diff) | |
| download | mariadb-git-b170b126b02c2989e68694d6781fb48d4f316363.tar.gz | |
merge with 5.1
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 36a999c9e76..4075e893c96 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5521,7 +5521,7 @@ longlong Item_equal::val_int() return 0; List_iterator_fast<Item_field> it(fields); Item *item= const_item ? const_item : it++; - if ((null_value= item->null_value)) + if ((null_value= item->is_null())) return 0; eval_item->store_value(item); while ((item_field= it++)) @@ -5529,7 +5529,7 @@ longlong Item_equal::val_int() /* Skip fields of non-const tables. They haven't been read yet */ if (item_field->field->table->const_table) { - if ((null_value= item_field->null_value) || eval_item->cmp(item_field)) + if ((null_value= item_field->is_null()) || eval_item->cmp(item_field)) return 0; } } |