diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
commit | c6b904abf8a139a3b95c9825cc7c53fd8f1a6fd0 (patch) | |
tree | a0d8f4957cf9d256a3cc3445c7db25384f97e249 /mysql-test/t/func_misc.test | |
parent | 28a5059a92707e009aada358bf103fa386ea7c2c (diff) | |
parent | 3d799bdffd04beba3dad4f1ece915104b0284157 (diff) | |
download | mariadb-git-c6b904abf8a139a3b95c9825cc7c53fd8f1a6fd0.tar.gz |
merge mysql-5.5->mysql-5.5-bugteam
Diffstat (limited to 'mysql-test/t/func_misc.test')
-rw-r--r-- | mysql-test/t/func_misc.test | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 31462d83c41..9257314013d 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -511,6 +511,19 @@ SELECT DISTINCT GREATEST(a, (SELECT b FROM t1 LIMIT 1)) FROM t1 UNION SELECT 1; DROP TABLE t1; + +# +# Bug #57283: inet_ntoa() crashes +# +SELECT INET_NTOA(0); +SELECT '1' IN ('1', INET_NTOA(0)); + + +--echo # +--echo # End of 5.1 tests +--echo # + + --echo # --echo # Bug #58199: name_const in the having clause crashes --echo # @@ -523,4 +536,11 @@ SELECT 1 from t1 HAVING NAME_CONST('', a); DROP TABLE t1; ---echo End of tests + +--echo # +--echo # End of 5.5 tests +--echo # + +--echo # +--echo # End of tests +--echo # |