database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4272 fix.

Browse Source 
Incorrect NULL value handling in Item_func_conv_charset fixed.
This commit is contained in:
unknown
2013-03-14 19:07:20 +02:00
parent de5d2550af
commit ecd4bf62d4
4 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/func_str.result
View File

@@ -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
#

18
mysql-test/t/func_str.test
View File

@@ -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 #