diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-12 14:14:27 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-12 14:14:27 +0300 |
commit | 39bc53e7c7e97e63a5346dc77bb8603e32e38c79 (patch) | |
tree | 9f06ea00c5e840222fd542c0b8b2ce7091a1510c /mysql-test/r/func_regexp.result | |
parent | 048cb42dbfadc57761ec8575b344046db91808cd (diff) | |
parent | 9380fdb1c6d676fe856b9809ffc3f3f9e8cdc98d (diff) | |
download | mariadb-git-39bc53e7c7e97e63a5346dc77bb8603e32e38c79.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt
mysql-test/r/func_regexp.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_regexp.result')
-rw-r--r-- | mysql-test/r/func_regexp.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result index 4e35c2a1348..05e56f05457 100644 --- a/mysql-test/r/func_regexp.result +++ b/mysql-test/r/func_regexp.result @@ -98,3 +98,8 @@ R2 R3 deallocate prepare stmt1; drop table t1; +End of 4.1 tests +SELECT 1 REGEXP NULL; +1 REGEXP NULL +NULL +End of 5.0 tests |