diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:38:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:38:54 +0200 |
| commit | c676f58c270d75b6c1889b24b9833afc65b0d98b (patch) | |
| tree | 3c0a20dcfb28fd4c1562506ef597c5b21b044cfe /sql/item_cmpfunc.cc | |
| parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
| parent | 762419a5732fceb5c7ed5728cd7d22b4d82ff74c (diff) | |
| download | mariadb-git-c676f58c270d75b6c1889b24b9833afc65b0d98b.tar.gz | |
Merge 10.1 into 10.2
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 8e237ef1d65..83716a0e924 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4678,7 +4678,7 @@ Item_cond::eval_not_null_tables(void *opt_arg) if (item->const_item() && !item->with_param && !item->is_expensive() && !cond_has_datetime_is_null(item)) { - if (item->val_int() == is_and_cond && top_level()) + if (item->eval_const_cond() == is_and_cond && top_level()) { /* a. This is "... AND true_cond AND ..." |