diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
| commit | 9258097fa3617b720b2b518060c0d09a00455051 (patch) | |
| tree | 0d9e98513620fdb440f1d0f78351ca794a0f731d /sql/item_cmpfunc.cc | |
| parent | cdc8debcaad6ee18ff7a146ab3f365367fe8ec93 (diff) | |
| parent | dc7c080369472f6f33344299d2e3d01619edf885 (diff) | |
| download | mariadb-git-9258097fa3617b720b2b518060c0d09a00455051.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 6834820c0b5..577a98df0d2 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5119,7 +5119,11 @@ longlong Item_func_isnull::val_int() void Item_func_isnull::print(String *str, enum_query_type query_type) { - args[0]->print_parenthesised(str, query_type, precedence()); + if (const_item() && !args[0]->maybe_null && + !(query_type & (QT_NO_DATA_EXPANSION | QT_VIEW_INTERNAL))) + str->append("/*always not null*/ 1"); + else + args[0]->print_parenthesised(str, query_type, precedence()); str->append(STRING_WITH_LEN(" is null")); } |