diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-21 20:35:58 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-21 20:35:58 +0300 |
| commit | a34e76c66abea6c4971cbdfe3b13cda272a81ca2 (patch) | |
| tree | 9b8ca6f7c941d22f516a5c39bd0013d8ab35310c /sql/item_cmpfunc.cc | |
| parent | db2032fd7311c01e6f9d795a64be7144cf4b0a69 (diff) | |
| download | mariadb-git-a34e76c66abea6c4971cbdfe3b13cda272a81ca2.tar.gz | |
Fixes for gcc 3.1
Fixed bug in new code for regexp LIKE NULL
BUILD/SETUP.sh:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
Fixes for gcc 3.1
Docs/manual.texi:
Fixed typo
include/violite.h:
Fixes for gcc 3.1
mysql-test/r/func_concat.result:
Updated test results
sql/item_cmpfunc.cc:
Fixed bug in new code for regexp LIKE NULL
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index c21ad18f08e..d95dbf8ef97 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1280,6 +1280,9 @@ bool Item_func_like::fix_fields(THD *thd,struct st_table_list *tlist) if (args[1]->const_item() && !(specialflag & SPECIAL_NO_NEW_FUNC)) { String* res2 = args[1]->val_str(&tmp_value2); + if (!res2) + return 0; // Null argument + const size_t len = res2->length(); const char* first = res2->ptr(); const char* last = first + len - 1; |