diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-08 22:04:17 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-08 22:04:17 +0400 |
commit | 3d52be158467a4cfdb397ca0ad3a808ebdcf26ff (patch) | |
tree | a0686066351b8e7441c1b2937a6d675b4a2963fd /mysql-test/t/func_str.test | |
parent | ceefecb2112559e3289a6bb457ef739720f0f789 (diff) | |
parent | 012ae63522372a16e824b7a47f04533b9f43423f (diff) | |
download | mariadb-git-3d52be158467a4cfdb397ca0ad3a808ebdcf26ff.tar.gz |
Merge bk@192.168.21.1:mysql-5.1
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/func_str.result:
merging
mysql-test/r/sp.result:
merging
mysql-test/r/view.result:
merging
mysql-test/t/func_str.test:
merging
mysql-test/t/view.test:
merging
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r-- | mysql-test/t/func_str.test | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index ddab3d03454..97651a42642 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1115,7 +1115,6 @@ select repeat('a', cast(2 as unsigned int)); select rpad('abc', cast(5 as unsigned integer), 'x'); select lpad('abc', cast(5 as unsigned integer), 'x'); - # # Bug #25197 :repeat function returns null when using table field directly as count # @@ -1137,4 +1136,10 @@ SELECT REPEAT( '#', tire ) AS A, DROP TABLE t1; +# +# Bug #26537: UNHEX() IS NULL comparison fails +# +SELECT UNHEX('G'); +SELECT UNHEX('G') IS NULL; + --echo End of 5.0 tests |