diff options
Diffstat (limited to 'mysql-test/main/mysqldump.result')
-rw-r--r-- | mysql-test/main/mysqldump.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index 556245df9cd..41a719c6a94 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -2750,6 +2750,8 @@ CREATE PROCEDURE bug9056_proc2(OUT a INT) BEGIN select sum(id) from t1 into a; END // +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead set sql_mode='ansi'; create procedure `a'b` () select 1; set sql_mode=''; @@ -5161,16 +5163,16 @@ USE BUG52792; SET NAMES utf8; CREATE FUNCTION `straße` ( c1 CHAR(20)) RETURNS CHAR(50) DETERMINISTIC -RETURN CONCAT(']]>, ', s, '!'); +RETURN CONCAT(']]>, ', c1, '!'); <?xml version="1.0"?> <mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <database name="BUG52792"> <routines> <routine Function="straße" sql_mode="" character_set_client="utf8" collation_connection="utf8_general_ci" Database_Collation="latin1_swedish_ci"> <![CDATA[ -CREATE DEFINER=`root`@`localhost` FUNCTION `straße`( c1 CHAR(20)) RETURNS char(50) CHARSET latin1 +CREATE DEFINER=`root`@`localhost` FUNCTION `straße`(c1 CHAR(20)) RETURNS char(50) CHARSET latin1 DETERMINISTIC -RETURN CONCAT(']]]]><![CDATA[>, ', s, '!') +RETURN CONCAT(']]]]><![CDATA[>, ', c1, '!') ]]> </routine> </routines> |