diff options
author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-11-18 12:14:27 +0300 |
---|---|---|
committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-11-18 12:14:27 +0300 |
commit | 52e88852697896b7fd150faf28c60a56cda42ab8 (patch) | |
tree | 3e9798ec74b0e0d8d821075dc8feaed107d7d864 /mysql-test | |
parent | 2db0a406fd726e5bbbfef1ea9c01df12c24441fc (diff) | |
parent | 1c94d43bbb60817252a87453d3a1d1a7d0f2a35c (diff) | |
download | mariadb-git-52e88852697896b7fd150faf28c60a56cda42ab8.tar.gz |
5.1-security->5.5-security merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/ctype_latin1.result | 9 | ||||
-rw-r--r-- | mysql-test/t/ctype_latin1.test | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result index 6216819d172..c8182feaed2 100644 --- a/mysql-test/r/ctype_latin1.result +++ b/mysql-test/r/ctype_latin1.result @@ -410,6 +410,15 @@ hex(cast(_ascii 0x7f as char(1) character set latin1)) 7F End of 5.0 tests # +# Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings +# +SELECT '' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, ''); +'' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, '') +1 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '' +End of 5.1 tests +# # Start of 5.5 tests # # diff --git a/mysql-test/t/ctype_latin1.test b/mysql-test/t/ctype_latin1.test index 1733ee299d1..b8aae2eae40 100644 --- a/mysql-test/t/ctype_latin1.test +++ b/mysql-test/t/ctype_latin1.test @@ -128,6 +128,14 @@ select hex(cast(_ascii 0x7f as char(1) character set latin1)); --echo End of 5.0 tests + +--echo # +--echo # Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings +--echo # +SELECT '' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, ''); + +--echo End of 5.1 tests + --echo # --echo # Start of 5.5 tests |