diff options
| author | unknown <sanja@askmonty.org> | 2013-03-14 19:07:20 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-03-14 19:07:20 +0200 |
| commit | ecd4bf62d439b300facb4d5758c4670e6c96b7c5 (patch) | |
| tree | 38a90b75bb728965cc7a60a0f631a7fd7449ef53 /mysql-test | |
| parent | de5d2550af51593513e3770f109380dcf85979ef (diff) | |
| download | mariadb-git-ecd4bf62d439b300facb4d5758c4670e6c96b7c5.tar.gz | |
MDEV-4272 fix.
Incorrect NULL value handling in Item_func_conv_charset fixed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_str.result | 15 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 18 |
2 files changed, 25 insertions, 8 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 80729545902..185f7182934 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2864,9 +2864,6 @@ sha1('P'), Warnings: Warning 1292 Truncated incorrect DECIMAL value: '[.DC2.]' SET @@global.max_allowed_packet:= @tmp_max; -# -# End of 5.5 tests -# SELECT @tmp_max:= @@global.max_allowed_packet; @tmp_max:= @@global.max_allowed_packet 1048576 @@ -2880,3 +2877,15 @@ NULL Warnings: Warning 1301 Result of repeat() was larger than max_allowed_packet (1048576) - truncated SET @@global.max_allowed_packet:= @tmp_max; +# +# MDEV-4272: DIV operator crashes in Item_func_int_div::val_int +# (incorrect NULL value handling by convert) +# +create table t1(a int) select null; +select 1 div convert(a using utf8) from t1; +1 div convert(a using utf8) +NULL +drop table t1; +# +# End of 5.5 tests +# diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index d8d8f4538e1..cc6fd858718 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1502,11 +1502,6 @@ round( --connection default SET @@global.max_allowed_packet:= @tmp_max; --disconnect newconn - ---echo # ---echo # End of 5.5 tests ---echo # - # # Bug#11765562 58545: # EXPORT_SET() CAN BE USED TO MAKE ENTIRE SERVER COMPLETELY UNRESPONSIVE @@ -1517,3 +1512,16 @@ SELECT @@global.max_allowed_packet; SELECT CHAR_LENGTH(EXPORT_SET(1,1,1,REPEAT(1,100000000))); SET @@global.max_allowed_packet:= @tmp_max; +--echo # +--echo # MDEV-4272: DIV operator crashes in Item_func_int_div::val_int +--echo # (incorrect NULL value handling by convert) +--echo # +create table t1(a int) select null; +select 1 div convert(a using utf8) from t1; +drop table t1; + + +--echo # +--echo # End of 5.5 tests +--echo # + |