diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-08 11:16:11 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-08 11:16:11 +0400 |
commit | 30e34252f48599d605466c718ceb81a1a0e23b70 (patch) | |
tree | e755ce9a7565dd6f55f654c2ff1d742dd0b2c7ca | |
parent | 4f22919f5c9f5c1d0a3ca6ebef26ed7c84c74f4e (diff) | |
download | mariadb-git-30e34252f48599d605466c718ceb81a1a0e23b70.tar.gz |
More test result updates:
- Update test results for tests using SPs: SPs no longer
emit warnings/errors that were caught and handled inside SP
4 files changed, 3 insertions, 211 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result index 126d6c2080a..8b96e54eefd 100644 --- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result @@ -347,8 +347,6 @@ CALL h1(); -7- 1 1 1 1 1 1 END x1 x2 x3 x4 x5 x6 END 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' DROP TABLE IF EXISTS tnull; DROP PROCEDURE IF EXISTS sp1; CREATE TABLE tnull(f1 int); @@ -447,8 +445,6 @@ END// CALL h2(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' SELECT * FROM res_t1; w x a b @@ -554,8 +550,6 @@ exit handler 2 exit handler 2 exit handler 1 exit handler 1 -Warnings: -Error 1146 Table 'db_storedproc.tqq' doesn't exist create table res_t1(w char unique, x char); insert into res_t1 values ('a', 'b'); CREATE PROCEDURE h1 () @@ -586,8 +580,6 @@ END// CALL h1(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' This will fail, SQLSTATE 00000 is not allowed CREATE PROCEDURE sp1() begin1_label:BEGIN @@ -631,8 +623,6 @@ CALL sp2(); NULL @x2 @x 1 2 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -664,8 +654,6 @@ ERROR 42000: Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expe CALL sp2(); -1- @x2 @x -1- 0 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 SELECT '-3-', @x2, @x; -3- @x2 @x -3- 1 1 @@ -708,8 +696,6 @@ CALL sp2(); -2- 1 20 -4- @x2 @x -4- 11 22 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -776,33 +762,21 @@ SELECT @done, @x; 0 1 INSERT INTO temp VALUES('1', NULL); CALL sp1(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('2', NULL); CALL sp2(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('3', NULL); CALL sp3(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 INSERT INTO temp VALUES('4', NULL); CALL sp4(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 @@ -911,26 +885,18 @@ SELECT @done, @x; @done @x 0 1 CALL sp1(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp2(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp3(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 CALL sp4(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 @@ -1065,8 +1031,6 @@ SQLSTATE 21000 SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-1-', @x; -1- @x -1- 6 @@ -1077,24 +1041,18 @@ SQLSTATE SQLEXCEPTION SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-2-', @x; -2- @x -2- 6 CALL sp3(); SQLSTATE 20000 -Warnings: -Error 1339 Case not found for CASE statement SELECT '-3-', @x; -3- @x -3- 1 CALL sp4(); SQLSTATE SQLEXCEPTION -Warnings: -Error 1339 Case not found for CASE statement SELECT '-4-', @x; -4- @x -4- 1 @@ -1377,8 +1335,6 @@ CLOSE cur1; CLOSE cur2; END// CALL sp_outer(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT * FROM temp1; f0 cnt f1 f2 f3 f4 _sp_out_ 1 a` a` 1000-01-01 -5000 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 03c16d06595..0ee25154c50 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result @@ -348,8 +348,6 @@ CALL h1(); -7- 1 1 1 1 1 1 END x1 x2 x3 x4 x5 x6 END 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' DROP TABLE IF EXISTS tnull; DROP PROCEDURE IF EXISTS sp1; CREATE TABLE tnull(f1 int); @@ -448,8 +446,6 @@ END// CALL h2(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' SELECT * FROM res_t1; w x a b @@ -555,8 +551,6 @@ exit handler 2 exit handler 2 exit handler 1 exit handler 1 -Warnings: -Error 1146 Table 'db_storedproc.tqq' doesn't exist create table res_t1(w char unique, x char); insert into res_t1 values ('a', 'b'); CREATE PROCEDURE h1 () @@ -587,8 +581,6 @@ END// CALL h1(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' This will fail, SQLSTATE 00000 is not allowed CREATE PROCEDURE sp1() begin1_label:BEGIN @@ -632,8 +624,6 @@ CALL sp2(); NULL @x2 @x 1 2 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -665,8 +655,6 @@ ERROR 42000: Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expe CALL sp2(); -1- @x2 @x -1- 0 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 SELECT '-3-', @x2, @x; -3- @x2 @x -3- 1 1 @@ -709,8 +697,6 @@ CALL sp2(); -2- 1 20 -4- @x2 @x -4- 11 22 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -777,33 +763,21 @@ SELECT @done, @x; 0 1 INSERT INTO temp VALUES('1', NULL); CALL sp1(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('2', NULL); CALL sp2(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('3', NULL); CALL sp3(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 INSERT INTO temp VALUES('4', NULL); CALL sp4(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 @@ -912,26 +886,18 @@ SELECT @done, @x; @done @x 0 1 CALL sp1(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp2(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp3(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 CALL sp4(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 @@ -1066,8 +1032,6 @@ SQLSTATE 21000 SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-1-', @x; -1- @x -1- 6 @@ -1078,24 +1042,18 @@ SQLSTATE SQLEXCEPTION SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-2-', @x; -2- @x -2- 6 CALL sp3(); SQLSTATE 20000 -Warnings: -Error 1339 Case not found for CASE statement SELECT '-3-', @x; -3- @x -3- 1 CALL sp4(); SQLSTATE SQLEXCEPTION -Warnings: -Error 1339 Case not found for CASE statement SELECT '-4-', @x; -4- @x -4- 1 @@ -1378,8 +1336,6 @@ CLOSE cur1; CLOSE cur2; END// CALL sp_outer(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT * FROM temp1; f0 cnt f1 f2 f3 f4 _sp_out_ 1 a` a` 1000-01-01 -5000 diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result index 03c16d06595..0ee25154c50 100644 --- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result @@ -348,8 +348,6 @@ CALL h1(); -7- 1 1 1 1 1 1 END x1 x2 x3 x4 x5 x6 END 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' DROP TABLE IF EXISTS tnull; DROP PROCEDURE IF EXISTS sp1; CREATE TABLE tnull(f1 int); @@ -448,8 +446,6 @@ END// CALL h2(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' SELECT * FROM res_t1; w x a b @@ -555,8 +551,6 @@ exit handler 2 exit handler 2 exit handler 1 exit handler 1 -Warnings: -Error 1146 Table 'db_storedproc.tqq' doesn't exist create table res_t1(w char unique, x char); insert into res_t1 values ('a', 'b'); CREATE PROCEDURE h1 () @@ -587,8 +581,6 @@ END// CALL h1(); x1 x2 x3 x4 x5 x6 1 1 1 1 1 1 -Warnings: -Error 1062 Duplicate entry 'a' for key 'w' This will fail, SQLSTATE 00000 is not allowed CREATE PROCEDURE sp1() begin1_label:BEGIN @@ -632,8 +624,6 @@ CALL sp2(); NULL @x2 @x 1 2 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -665,8 +655,6 @@ ERROR 42000: Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expe CALL sp2(); -1- @x2 @x -1- 0 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 SELECT '-3-', @x2, @x; -3- @x2 @x -3- 1 1 @@ -709,8 +697,6 @@ CALL sp2(); -2- 1 20 -4- @x2 @x -4- 11 22 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE sp1; DROP PROCEDURE sp2; @@ -777,33 +763,21 @@ SELECT @done, @x; 0 1 INSERT INTO temp VALUES('1', NULL); CALL sp1(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('2', NULL); CALL sp2(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 1 INSERT INTO temp VALUES('3', NULL); CALL sp3(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 INSERT INTO temp VALUES('4', NULL); CALL sp4(); -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1265 Data truncated for column 'f2' at row 1 SELECT @done, @x; @done @x 1 0 @@ -912,26 +886,18 @@ SELECT @done, @x; @done @x 0 1 CALL sp1(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp2(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 2 CALL sp3(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 CALL sp4(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT @done, @x; @done @x 1 1 @@ -1066,8 +1032,6 @@ SQLSTATE 21000 SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-1-', @x; -1- @x -1- 6 @@ -1078,24 +1042,18 @@ SQLSTATE SQLEXCEPTION SQLSTATE 24000 -Warnings: -Error 1326 Cursor is not open SELECT '-2-', @x; -2- @x -2- 6 CALL sp3(); SQLSTATE 20000 -Warnings: -Error 1339 Case not found for CASE statement SELECT '-3-', @x; -3- @x -3- 1 CALL sp4(); SQLSTATE SQLEXCEPTION -Warnings: -Error 1339 Case not found for CASE statement SELECT '-4-', @x; -4- @x -4- 1 @@ -1378,8 +1336,6 @@ CLOSE cur1; CLOSE cur2; END// CALL sp_outer(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT * FROM temp1; f0 cnt f1 f2 f3 f4 _sp_out_ 1 a` a` 1000-01-01 -5000 diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index 179d0cd814e..e64d7a1b0ed 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -1822,7 +1822,7 @@ grant execute on db_storedproc.* to 'user_1'@'localhost'; flush privileges; drop table IF EXISTS mysql.t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'mysql.t1' create table mysql.t1( f1 char ); DROP PROCEDURE IF EXISTS sp11; Warnings: @@ -9330,8 +9330,6 @@ insert into t2 values (1); set @x = 3; END// CALL sp1(); -Warnings: -Error 1136 Column count doesn't match value count at row 1 DROP PROCEDURE sp1; DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13761,8 +13759,6 @@ END// CALL sp1(); x y @x NULL a 3 -Warnings: -Error 1305 PROCEDURE db_storedproc.nonsexist does not exist SELECT @v1, @v2; @v1 @v2 4 a @@ -14947,8 +14943,6 @@ NULL NULL NULL NULL @x @y NULL NULL -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed DROP PROCEDURE sp1; Testcase 4.2.63: @@ -15108,8 +15102,6 @@ END; fetch cur1 into newf1, newf2, newf4, newf3; END// CALL sp1(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed DROP PROCEDURE sp1; Testcase 4.2.70: @@ -22358,7 +22350,7 @@ Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist drop table IF EXISTS res_t9; Warnings: -Note 1051 Unknown table 'res_t9' +Note 1051 Unknown table 'db_storedproc.res_t9' create table res_t9 (f1 int, f2 char(25), f3 int); insert into res_t9 values (10, 'abc', 20); CREATE FUNCTION fn1(i1 longtext) returns longtext @@ -22384,7 +22376,7 @@ Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist drop table IF EXISTS res_t9; Warnings: -Note 1051 Unknown table 'res_t9' +Note 1051 Unknown table 'db_storedproc.res_t9' create table res_t9 (f1 int, f2 char(25), f3 int); CREATE FUNCTION fn1(i1 longtext) returns longtext BEGIN @@ -22460,8 +22452,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22479,8 +22469,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1305 PROCEDURE db_storedproc.sp1 does not exist DROP PROCEDURE h1; Testcase 4.11.3: @@ -22500,8 +22488,6 @@ CALL sp1 (1); set @x=0; END// CALL h1(); -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 SELECT @x, @x2; @x @x2 1 1 @@ -22520,8 +22506,6 @@ CALL sp1 (1); set @x=0; END// CALL h1 (); -Warnings: -Error 1305 PROCEDURE db_storedproc.sp1 does not exist SELECT @x, @x2; @x @x2 1 1 @@ -22546,8 +22530,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22570,8 +22552,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22594,8 +22574,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22613,8 +22591,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1305 PROCEDURE db_storedproc.sp1 does not exist DROP PROCEDURE h1; Testcase 4.11.9: @@ -22634,8 +22610,6 @@ CALL sp1 (1); set @x=0; END// CALL h1(); -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 SELECT @x, @x2; @x @x2 1 1 @@ -22654,8 +22628,6 @@ CALL sp1 (1); set @x=0; END// CALL h1 (); -Warnings: -Error 1305 PROCEDURE db_storedproc.sp1 does not exist SELECT @x, @x2; @x @x2 1 1 @@ -22680,8 +22652,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22704,8 +22674,6 @@ END// CALL h1 (); @x @x2 1 1 -Warnings: -Error 1318 Incorrect number of arguments for PROCEDURE db_storedproc.sp1; expected 2, got 1 DROP PROCEDURE h1; DROP PROCEDURE sp1; @@ -22741,8 +22709,6 @@ done 1 done 1 -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22816,8 +22782,6 @@ done 0 done 1 -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22855,8 +22819,6 @@ done 0 done 1 -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22887,8 +22849,6 @@ done 0 done 1 -Warnings: -Error 1328 Incorrect number of FETCH variables DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22919,8 +22879,6 @@ done 0 done 1 -Warnings: -Error 1328 Incorrect number of FETCH variables DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22951,8 +22909,6 @@ END// CALL h1(); done 0 -Warnings: -Error 1328 Incorrect number of FETCH variables DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -22983,8 +22939,6 @@ END// CALL h1(); done 0 -Warnings: -Error 1328 Incorrect number of FETCH variables DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23015,8 +22969,6 @@ done 0 done 1 -Warnings: -Error 1325 Cursor is already open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23048,8 +23000,6 @@ done 0 done @x 1 1 -Warnings: -Error 1325 Cursor is already open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23080,8 +23030,6 @@ END// CALL h1(); done 0 -Warnings: -Error 1325 Cursor is already open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23112,8 +23060,6 @@ END// CALL h1(); done 0 -Warnings: -Error 1325 Cursor is already open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23141,8 +23087,6 @@ END// CALL h1(); done @x 1 1 -Warnings: -Error 1326 Cursor is not open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23170,8 +23114,6 @@ END// CALL h1(); done @x 1 1 -Warnings: -Error 1326 Cursor is not open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23197,8 +23139,6 @@ set @x=1; SELECT done, @x; END// CALL h1(); -Warnings: -Error 1326 Cursor is not open DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23224,8 +23164,6 @@ set @x=1; SELECT done, @x; END// CALL h1(); -Warnings: -Error 1326 Cursor is not open DROP PROCEDURE IF EXISTS h1; drop table IF EXISTS res_t1; drop table IF EXISTS res_t2; @@ -23256,8 +23194,6 @@ END// CALL h1(); done @x 1 1 -Warnings: -Error 1339 Case not found for CASE statement DROP PROCEDURE IF EXISTS h1; drop table IF EXISTS res_t1; drop table IF EXISTS res_t2; @@ -23288,8 +23224,6 @@ END// CALL h1(); done @x 1 1 -Warnings: -Error 1339 Case not found for CASE statement DROP PROCEDURE IF EXISTS h1; drop table IF EXISTS res_t1; drop table IF EXISTS res_t2; @@ -23318,8 +23252,6 @@ set @x=1; SELECT done, @x; END// CALL h1(); -Warnings: -Error 1339 Case not found for CASE statement DROP PROCEDURE IF EXISTS h1; drop table IF EXISTS res_t1; drop table IF EXISTS res_t2; @@ -23348,8 +23280,6 @@ set @x=1; SELECT done, @x; END// CALL h1(); -Warnings: -Error 1339 Case not found for CASE statement DROP PROCEDURE IF EXISTS h1; DROP TABLE IF EXISTS res_t1; DROP TABLE IF EXISTS res_t2; @@ -23498,9 +23428,6 @@ CREATE TABLE res_t1(w CHAR, x CHAR); INSERT INTO res_t1 VALUES('a', 'b'); INSERT INTO res_t1 VALUES('c', 'd'); CALL h1(); -Warnings: -Warning 1265 Data truncated for column 'w' at row 1 -Warning 1265 Data truncated for column 'x' at row 1 SELECT @done, @x; @done @x 1 1 @@ -23523,9 +23450,6 @@ CREATE TABLE res_t1(w CHAR, x CHAR); INSERT INTO res_t1 VALUES('a', 'b'); INSERT INTO res_t1 VALUES('c', 'd'); CALL h1(); -Warnings: -Warning 1265 Data truncated for column 'w' at row 1 -Warning 1265 Data truncated for column 'x' at row 1 SELECT @done, @x; @done @x 1 1 |