diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-08 11:48:49 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-08 11:48:49 +0400 |
| commit | 62484d2e23e15831260a3874748f58c6fda2f346 (patch) | |
| tree | aa8af729f6edc93795b4dc20b398de642015bebe /sql/item_cmpfunc.cc | |
| parent | 220623572ddd463efb64f38284cce03545f52262 (diff) | |
| parent | e6a6f653a9c67741f67df9448b3182066939283c (diff) | |
| download | mariadb-git-62484d2e23e15831260a3874748f58c6fda2f346.tar.gz | |
Merge from 5.3
pending merges:
Alexander Barkov 2013-08-08 MDEV-4512 Valgrind warnings in my_long10_to_...
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index ebd03743f48..206c059813f 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1966,7 +1966,7 @@ void Item_func_interval::fix_length_and_dec() for (uint i= 1; not_null_consts && i < rows; i++) { Item *el= row->element_index(i); - not_null_consts&= el->const_item() & !el->is_null(); + not_null_consts&= el->const_item() && !el->is_null(); } if (not_null_consts && |