Auto-merge from mysql-5.1-security.
This commit is contained in:
commit
bbcce1cbc5
@ -830,6 +830,7 @@ SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)));
|
|||||||
--echo # BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN
|
--echo # BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN
|
||||||
--echo # GEOMETRY FUNCTION ARGUMENTS
|
--echo # GEOMETRY FUNCTION ARGUMENTS
|
||||||
--echo #
|
--echo #
|
||||||
|
--replace_regex /non geometric .* value/non geometric '' value/
|
||||||
--error ER_ILLEGAL_VALUE_FOR_TYPE
|
--error ER_ILLEGAL_VALUE_FOR_TYPE
|
||||||
SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
|
SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user