summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_regexp.test
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2008-09-05 13:30:01 +0500
committerRamil Kalimullin <ramil@mysql.com>2008-09-05 13:30:01 +0500
commit788be2aebdb0bce63b45b1fecf2f2d8a12a5cfc7 (patch)
tree0520cf1f8caad29cba53bc9eecd64adf894dd404 /mysql-test/t/func_regexp.test
parentbcbff0b93bfca0c5b199cde184f1127b39d80bc5 (diff)
downloadmariadb-git-788be2aebdb0bce63b45b1fecf2f2d8a12a5cfc7.tar.gz
Fix for bug #39021: SELECT REGEXP BINARY NULL never returns
Problem: SELECT ... REGEXP BINARY NULL may lead to server crash/hang. Fix: properly handle NULL regular expressions. mysql-test/r/func_regexp.result: Fix for bug #39021: SELECT REGEXP BINARY NULL never returns - test result. mysql-test/t/func_regexp.test: Fix for bug #39021: SELECT REGEXP BINARY NULL never returns - test case. sql/item_cmpfunc.cc: Fix for bug #39021: SELECT REGEXP BINARY NULL never returns - checking regular expressions' null_value we tested it without a val_xxx() call before, which is wrong. Now Item_func_regex::regcomp() returns -1 in the case and allows to handle NULL expessions properly. sql/item_cmpfunc.h: Fix for bug #39021: SELECT REGEXP BINARY NULL never returns - checking regular expressions' null_value we tested it without a val_xxx() call before, which is wrong. Now Item_func_regex::regcomp() returns -1 in the case and allows to handle NULL expessions properly.
Diffstat (limited to 'mysql-test/t/func_regexp.test')
-rw-r--r--mysql-test/t/func_regexp.test10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/func_regexp.test b/mysql-test/t/func_regexp.test
index 1b35fab9d54..43fda0d11a8 100644
--- a/mysql-test/t/func_regexp.test
+++ b/mysql-test/t/func_regexp.test
@@ -64,4 +64,14 @@ drop table t1;
SELECT 1 REGEXP NULL;
+
+#
+# Bug #39021: SELECT REGEXP BINARY NULL never returns
+#
+
+SELECT '' REGEXP BINARY NULL;
+SELECT NULL REGEXP BINARY NULL;
+SELECT 'A' REGEXP BINARY NULL;
+SELECT "ABC" REGEXP BINARY NULL;
+
--echo End of 5.0 tests