diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:50:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:50:33 +0200 |
| commit | 9c18b9660302a76a6ff9bd505888048a13586a4c (patch) | |
| tree | 8f0cd57e97ccca5f633825863e9e0f8e705ed8ff /sql/item_cmpfunc.cc | |
| parent | d8d6e995282dd9485f65517efbb684eabaf52322 (diff) | |
| parent | 47ab793d71f2755b026672e4657174a1740b6ae2 (diff) | |
| download | mariadb-git-9c18b9660302a76a6ff9bd505888048a13586a4c.tar.gz | |
Merge 10.4 into 10.5
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 389f012a016..ddabdaaff53 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5619,7 +5619,7 @@ void Item_func_like::print(String *str, enum_query_type query_type) longlong Item_func_like::val_int() { DBUG_ASSERT(fixed == 1); - DBUG_ASSERT(escape != -1); + DBUG_ASSERT(escape != ESCAPE_NOT_INITIALIZED); String* res= args[0]->val_str(&cmp_value1); if (args[0]->null_value) { @@ -5723,7 +5723,7 @@ bool fix_escape_item(THD *thd, Item *escape_item, String *tmp_str, return TRUE; } - IF_DBUG(*escape= -1,); + IF_DBUG(*escape= ESCAPE_NOT_INITIALIZED,); if (escape_item->const_item()) { |