diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-08 15:28:00 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | 8b2e642aa214db729161252b96f36bfbae3add21 (patch) | |
| tree | 006dcc588623c7c7ee508eca3534259f62244f2c /mysql-test/suite/funcs_1/r/memory_storedproc_02.result | |
| parent | f556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff) | |
| download | mariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz | |
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'mysql-test/suite/funcs_1/r/memory_storedproc_02.result')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/memory_storedproc_02.result | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result index 0ee25154c50..fe23f9de0c5 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result @@ -28,7 +28,7 @@ load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/t4.txt' into table t6; USE db_storedproc; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = <engine_to_be_tested>; -load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' into table t7; +load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' ignore into table t7; Warnings: Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 2 @@ -42,7 +42,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 10 create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = <engine_to_be_tested>; -load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' into table t8; +load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' ignore into table t8; Warnings: Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 2 @@ -74,6 +74,7 @@ Ensure that the scope of each BEGIN/END compound statement within a stored procedure definition is properly applied -------------------------------------------------------------------------------- DROP PROCEDURE IF EXISTS sp1; +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp1( ) begin_label: BEGIN declare x char DEFAULT 'x'; @@ -714,6 +715,7 @@ DROP PROCEDURE IF EXISTS sp3; DROP PROCEDURE IF EXISTS sp4; DROP TABLE IF EXISTS temp; CREATE TABLE temp( f1 CHAR, f2 CHAR); +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp0() BEGIN set @done=0; @@ -721,6 +723,7 @@ set @x=0; insert into temp values('xxx', 'yy'); set @x=1; END// +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp1() BEGIN declare continue handler for sqlstate '01000' set @done = 1; @@ -729,6 +732,7 @@ set @x=0; insert into temp values('xxx', 'yy'); set @x=1; END// +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp2() BEGIN declare continue handler for sqlwarning set @done = 1; @@ -737,6 +741,7 @@ set @x=0; insert into temp values('xxx', 'yy'); set @x=1; END// +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp3() BEGIN declare exit handler for sqlstate '01000' set @done = 1; @@ -745,6 +750,7 @@ set @x=0; insert into temp values('xxx', 'yy'); set @x=1; END// +SET STATEMENT sql_mode = '' FOR CREATE PROCEDURE sp4() BEGIN declare exit handler for sqlwarning set @done = 1; |