From 0a4ec61e41a69f3723a5acb2de3b9321708e9f77 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Apr 2008 19:22:37 +0200 Subject: [PATCH] Fixes for failing funcs_1 tests in mysql-5.1.24-rc Problems were caused by modifications of - the server - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix) affects several ..._storedproc* tests - improved error message affects the ..._trig_03e - improved content of information_schema.COLUMNS about information_schema.REFERENTIAL_CONSTRAINTS affects is_columns_is - the content of the community build (collations) affects charset_collation_3 mysql-test/suite/funcs_1/r/charset_collation_3.result: Updated result mysql-test/suite/funcs_1/r/innodb_storedproc.result: Updated result mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Updated result mysql-test/suite/funcs_1/r/innodb_trig_03e.result: Updated result mysql-test/suite/funcs_1/r/is_columns_is.result: Updated result mysql-test/suite/funcs_1/r/memory_storedproc.result: Updated result mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Updated result mysql-test/suite/funcs_1/r/memory_trig_03e.result: Updated result mysql-test/suite/funcs_1/r/myisam_storedproc.result: Updated result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Updated result mysql-test/suite/funcs_1/r/myisam_trig_03e.result: Updated result mysql-test/suite/funcs_1/r/ndb_storedproc.result: Updated result mysql-test/suite/funcs_1/r/ndb_storedproc_02.result: Updated result mysql-test/suite/funcs_1/r/ndb_trig_03e.result: Updated result mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Corrected script mysql-test/suite/funcs_1/storedproc/storedproc_master.inc: Corrected script --- .../funcs_1/r/charset_collation_3.result | 99 ++++++++++--------- .../suite/funcs_1/r/innodb_storedproc.result | 15 +-- .../funcs_1/r/innodb_storedproc_02.result | 7 +- .../suite/funcs_1/r/innodb_trig_03e.result | 2 +- .../suite/funcs_1/r/is_columns_is.result | 2 +- .../suite/funcs_1/r/memory_storedproc.result | 15 +-- .../funcs_1/r/memory_storedproc_02.result | 7 +- .../suite/funcs_1/r/memory_trig_03e.result | 2 +- .../suite/funcs_1/r/myisam_storedproc.result | 15 +-- .../funcs_1/r/myisam_storedproc_02.result | 7 +- .../suite/funcs_1/r/myisam_trig_03e.result | 2 +- .../suite/funcs_1/r/ndb_storedproc.result | 15 +-- .../suite/funcs_1/r/ndb_storedproc_02.result | 7 +- .../suite/funcs_1/r/ndb_trig_03e.result | 2 +- .../funcs_1/storedproc/storedproc_02.inc | 4 +- .../funcs_1/storedproc/storedproc_master.inc | 15 +-- 16 files changed, 85 insertions(+), 131 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/charset_collation_3.result b/mysql-test/suite/funcs_1/r/charset_collation_3.result index b9a2dbe8a98..55ed4b4704c 100644 --- a/mysql-test/suite/funcs_1/r/charset_collation_3.result +++ b/mysql-test/suite/funcs_1/r/charset_collation_3.result @@ -47,10 +47,10 @@ SELECT * FROM information_schema.collations ORDER BY collation_name; COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN -armscii8_bin armscii8 64 Yes 1 -armscii8_general_ci armscii8 32 Yes Yes 1 -ascii_bin ascii 65 Yes 1 -ascii_general_ci ascii 11 Yes Yes 1 +armscii8_bin armscii8 64 0 +armscii8_general_ci armscii8 32 Yes 0 +ascii_bin ascii 65 0 +ascii_general_ci ascii 11 Yes 0 big5_bin big5 84 Yes 1 big5_chinese_ci big5 1 Yes Yes 1 binary binary 63 Yes Yes 1 @@ -58,26 +58,27 @@ cp1250_bin cp1250 66 Yes 1 cp1250_croatian_ci cp1250 44 Yes 1 cp1250_czech_cs cp1250 34 Yes 2 cp1250_general_ci cp1250 26 Yes Yes 1 -cp1251_bin cp1251 50 Yes 1 -cp1251_bulgarian_ci cp1251 14 Yes 1 -cp1251_general_ci cp1251 51 Yes Yes 1 -cp1251_general_cs cp1251 52 Yes 1 -cp1251_ukrainian_ci cp1251 23 Yes 1 -cp1256_bin cp1256 67 Yes 1 -cp1256_general_ci cp1256 57 Yes Yes 1 -cp1257_bin cp1257 58 Yes 1 -cp1257_general_ci cp1257 59 Yes Yes 1 -cp1257_lithuanian_ci cp1257 29 Yes 1 -cp850_bin cp850 80 Yes 1 -cp850_general_ci cp850 4 Yes Yes 1 -cp852_bin cp852 81 Yes 1 -cp852_general_ci cp852 40 Yes Yes 1 -cp866_bin cp866 68 Yes 1 -cp866_general_ci cp866 36 Yes Yes 1 +cp1250_polish_ci cp1250 99 Yes 1 +cp1251_bin cp1251 50 0 +cp1251_bulgarian_ci cp1251 14 0 +cp1251_general_ci cp1251 51 Yes 0 +cp1251_general_cs cp1251 52 0 +cp1251_ukrainian_ci cp1251 23 0 +cp1256_bin cp1256 67 0 +cp1256_general_ci cp1256 57 Yes 0 +cp1257_bin cp1257 58 0 +cp1257_general_ci cp1257 59 Yes 0 +cp1257_lithuanian_ci cp1257 29 0 +cp850_bin cp850 80 0 +cp850_general_ci cp850 4 Yes 0 +cp852_bin cp852 81 0 +cp852_general_ci cp852 40 Yes 0 +cp866_bin cp866 68 0 +cp866_general_ci cp866 36 Yes 0 cp932_bin cp932 96 Yes 1 cp932_japanese_ci cp932 95 Yes Yes 1 -dec8_bin dec8 69 Yes 1 -dec8_swedish_ci dec8 3 Yes Yes 1 +dec8_bin dec8 69 0 +dec8_swedish_ci dec8 3 Yes 0 eucjpms_bin eucjpms 98 Yes 1 eucjpms_japanese_ci eucjpms 97 Yes Yes 1 euckr_bin euckr 85 Yes 1 @@ -86,20 +87,20 @@ gb2312_bin gb2312 86 Yes 1 gb2312_chinese_ci gb2312 24 Yes Yes 1 gbk_bin gbk 87 Yes 1 gbk_chinese_ci gbk 28 Yes Yes 1 -geostd8_bin geostd8 93 Yes 1 -geostd8_general_ci geostd8 92 Yes Yes 1 -greek_bin greek 70 Yes 1 -greek_general_ci greek 25 Yes Yes 1 -hebrew_bin hebrew 71 Yes 1 -hebrew_general_ci hebrew 16 Yes Yes 1 -hp8_bin hp8 72 Yes 1 -hp8_english_ci hp8 6 Yes Yes 1 -keybcs2_bin keybcs2 73 Yes 1 -keybcs2_general_ci keybcs2 37 Yes Yes 1 -koi8r_bin koi8r 74 Yes 1 -koi8r_general_ci koi8r 7 Yes Yes 1 -koi8u_bin koi8u 75 Yes 1 -koi8u_general_ci koi8u 22 Yes Yes 1 +geostd8_bin geostd8 93 0 +geostd8_general_ci geostd8 92 Yes 0 +greek_bin greek 70 0 +greek_general_ci greek 25 Yes 0 +hebrew_bin hebrew 71 0 +hebrew_general_ci hebrew 16 Yes 0 +hp8_bin hp8 72 0 +hp8_english_ci hp8 6 Yes 0 +keybcs2_bin keybcs2 73 0 +keybcs2_general_ci keybcs2 37 Yes 0 +koi8r_bin koi8r 74 0 +koi8r_general_ci koi8r 7 Yes 0 +koi8u_bin koi8u 75 0 +koi8u_general_ci koi8u 22 Yes 0 latin1_bin latin1 47 Yes 1 latin1_danish_ci latin1 15 Yes 1 latin1_general_ci latin1 48 Yes 1 @@ -113,20 +114,20 @@ latin2_croatian_ci latin2 27 Yes 1 latin2_czech_cs latin2 2 Yes 4 latin2_general_ci latin2 9 Yes Yes 1 latin2_hungarian_ci latin2 21 Yes 1 -latin5_bin latin5 78 Yes 1 -latin5_turkish_ci latin5 30 Yes Yes 1 -latin7_bin latin7 79 Yes 1 -latin7_estonian_cs latin7 20 Yes 1 -latin7_general_ci latin7 41 Yes Yes 1 -latin7_general_cs latin7 42 Yes 1 -macce_bin macce 43 Yes 1 -macce_general_ci macce 38 Yes Yes 1 -macroman_bin macroman 53 Yes 1 -macroman_general_ci macroman 39 Yes Yes 1 +latin5_bin latin5 78 0 +latin5_turkish_ci latin5 30 Yes 0 +latin7_bin latin7 79 0 +latin7_estonian_cs latin7 20 0 +latin7_general_ci latin7 41 Yes 0 +latin7_general_cs latin7 42 0 +macce_bin macce 43 0 +macce_general_ci macce 38 Yes 0 +macroman_bin macroman 53 0 +macroman_general_ci macroman 39 Yes 0 sjis_bin sjis 88 Yes 1 sjis_japanese_ci sjis 13 Yes Yes 1 -swe7_bin swe7 82 Yes 1 -swe7_swedish_ci swe7 10 Yes Yes 1 +swe7_bin swe7 82 0 +swe7_swedish_ci swe7 10 Yes 0 tis620_bin tis620 89 Yes 1 tis620_thai_ci tis620 18 Yes Yes 4 ucs2_bin ucs2 90 Yes 1 @@ -190,6 +191,7 @@ cp1250_bin cp1250 cp1250_croatian_ci cp1250 cp1250_czech_cs cp1250 cp1250_general_ci cp1250 +cp1250_polish_ci cp1250 cp1251_bin cp1251 cp1251_bulgarian_ci cp1251 cp1251_general_ci cp1251 @@ -214,6 +216,7 @@ eucjpms_bin eucjpms eucjpms_japanese_ci eucjpms euckr_bin euckr euckr_korean_ci euckr +filename filename gb2312_bin gb2312 gb2312_chinese_ci gb2312 gbk_bin gbk diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result index c20276b1937..18579f3c275 100644 --- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result +++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result @@ -14309,10 +14309,7 @@ declare continue handler for cond1 set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.45: -------------------------------------------------------------------------------- @@ -14387,10 +14384,7 @@ declare continue handler for sqlstate '00000' set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.52: -------------------------------------------------------------------------------- @@ -23493,6 +23487,7 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE IF EXISTS h1; Testcase 4.11.40: @@ -23530,9 +23525,9 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' CALL h1(); -@x x1 -0 2 +ERROR 42000: PROCEDURE db_storedproc.h1 does not exist DROP PROCEDURE IF EXISTS h1; * Testcase 3.1.2.53 (4.11.42): 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 49f70d55676..50fa295e94f 100644 --- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result @@ -586,14 +586,9 @@ SELECT @var3, @var4; END begin2_label; SELECT @var1, @var2; END begin1_label// -CALL sp1(); -@var3 @var4 -NULL 8 -@var1 @var2 -NULL 6 +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE p1; DROP PROCEDURE h1; -DROP PROCEDURE sp1; DROP TABLE res_t1; Testcase 3.1.2.50: diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result index 048c070ea96..26546138ea2 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result @@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 before INSERT on t1 for each row set new.f1 = 'trig 1_0-yes'; Warnings: -Note 1449 There is no 'not_ex_user'@'localhost' registered +Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist drop trigger trg1_0; create definer=test_yesprivs@localhost trigger trg1_0 before INSERT on t1 for each row diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result index e2081af7e00..c1813a1add2 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result @@ -176,7 +176,7 @@ NULL information_schema REFERENTIAL_CONSTRAINTS MATCH_OPTION 7 NO varchar 64 19 NULL information_schema REFERENTIAL_CONSTRAINTS REFERENCED_TABLE_NAME 11 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema REFERENTIAL_CONSTRAINTS TABLE_NAME 10 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_CATALOG 4 NULL YES varchar 512 1536 NULL NULL utf8 utf8_general_ci varchar(512) select -NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_NAME 6 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select +NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_NAME 6 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_SCHEMA 5 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema REFERENTIAL_CONSTRAINTS UPDATE_RULE 8 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema ROUTINES CHARACTER_SET_CLIENT 21 NO varchar 32 96 NULL NULL utf8 utf8_general_ci varchar(32) select diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result index a8294aa3e27..3e22ef2593f 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result @@ -14309,10 +14309,7 @@ declare continue handler for cond1 set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.45: -------------------------------------------------------------------------------- @@ -14387,10 +14384,7 @@ declare continue handler for sqlstate '00000' set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.52: -------------------------------------------------------------------------------- @@ -23471,6 +23465,7 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE IF EXISTS h1; Testcase 4.11.40: @@ -23508,9 +23503,9 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' CALL h1(); -@x x1 -0 2 +ERROR 42000: PROCEDURE db_storedproc.h1 does not exist DROP PROCEDURE IF EXISTS h1; * Testcase 3.1.2.53 (4.11.42): 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 a76301ffa18..3476719c530 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result @@ -586,14 +586,9 @@ SELECT @var3, @var4; END begin2_label; SELECT @var1, @var2; END begin1_label// -CALL sp1(); -@var3 @var4 -NULL 8 -@var1 @var2 -NULL 6 +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE p1; DROP PROCEDURE h1; -DROP PROCEDURE sp1; DROP TABLE res_t1; Testcase 3.1.2.50: diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result index fad778ce7c0..251079f8638 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result @@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 before INSERT on t1 for each row set new.f1 = 'trig 1_0-yes'; Warnings: -Note 1449 There is no 'not_ex_user'@'localhost' registered +Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist drop trigger trg1_0; create definer=test_yesprivs@localhost trigger trg1_0 before INSERT on t1 for each row diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result index 2584807bcc6..8391a36e62e 100644 --- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result +++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result @@ -14309,10 +14309,7 @@ declare continue handler for cond1 set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.45: -------------------------------------------------------------------------------- @@ -14387,10 +14384,7 @@ declare continue handler for sqlstate '00000' set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.52: -------------------------------------------------------------------------------- @@ -23493,6 +23487,7 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE IF EXISTS h1; Testcase 4.11.40: @@ -23530,9 +23525,9 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' CALL h1(); -@x x1 -0 2 +ERROR 42000: PROCEDURE db_storedproc.h1 does not exist DROP PROCEDURE IF EXISTS h1; * Testcase 3.1.2.53 (4.11.42): 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 e20b3ed22ba..5d7549b8b5a 100644 --- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result @@ -586,14 +586,9 @@ SELECT @var3, @var4; END begin2_label; SELECT @var1, @var2; END begin1_label// -CALL sp1(); -@var3 @var4 -NULL 8 -@var1 @var2 -NULL 6 +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE p1; DROP PROCEDURE h1; -DROP PROCEDURE sp1; DROP TABLE res_t1; Testcase 3.1.2.50: diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result index bcd50198fca..68f8b2a0ef6 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result @@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 before INSERT on t1 for each row set new.f1 = 'trig 1_0-yes'; Warnings: -Note 1449 There is no 'not_ex_user'@'localhost' registered +Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist drop trigger trg1_0; create definer=test_yesprivs@localhost trigger trg1_0 before INSERT on t1 for each row diff --git a/mysql-test/suite/funcs_1/r/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result index 92cc86120d5..42886c69412 100644 --- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result +++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result @@ -14309,10 +14309,7 @@ declare continue handler for cond1 set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.45: -------------------------------------------------------------------------------- @@ -14387,10 +14384,7 @@ declare continue handler for sqlstate '00000' set @var2 = 1; set @x=1; SELECT @var2; END// -CALL sp1(); -@var2 -NULL -DROP PROCEDURE sp1; +ERROR 42000: Bad SQLSTATE: '00000' Testcase 4.2.52: -------------------------------------------------------------------------------- @@ -23495,6 +23489,7 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE IF EXISTS h1; Testcase 4.11.40: @@ -23532,9 +23527,9 @@ set x1 = 2; END; SELECT @x, x1; END// +ERROR 42000: Bad SQLSTATE: '00000' CALL h1(); -@x x1 -0 2 +ERROR 42000: PROCEDURE db_storedproc.h1 does not exist DROP PROCEDURE IF EXISTS h1; * Testcase 3.1.2.53 (4.11.42): diff --git a/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result index 419ade39c4f..032aef1d7e0 100644 --- a/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result @@ -586,14 +586,9 @@ SELECT @var3, @var4; END begin2_label; SELECT @var1, @var2; END begin1_label// -CALL sp1(); -@var3 @var4 -NULL 8 -@var1 @var2 -NULL 6 +ERROR 42000: Bad SQLSTATE: '00000' DROP PROCEDURE p1; DROP PROCEDURE h1; -DROP PROCEDURE sp1; DROP TABLE res_t1; Testcase 3.1.2.50: diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result index 0d097d6cd7c..2416732a129 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result @@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 before INSERT on t1 for each row set new.f1 = 'trig 1_0-yes'; Warnings: -Note 1449 There is no 'not_ex_user'@'localhost' registered +Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist drop trigger trg1_0; create definer=test_yesprivs@localhost trigger trg1_0 before INSERT on t1 for each row diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc index 2efc5a83663..756732b0e80 100644 --- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc +++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc @@ -696,6 +696,7 @@ delimiter ;// CALL h1(); +--error ER_SP_BAD_SQLSTATE delimiter //; CREATE PROCEDURE sp1() begin1_label:BEGIN @@ -710,12 +711,9 @@ CREATE PROCEDURE sp1() END begin1_label// delimiter ;// -CALL sp1(); - # cleanup 3.1.2.45+50 DROP PROCEDURE p1; DROP PROCEDURE h1; -DROP PROCEDURE sp1; DROP TABLE res_t1; diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc index 972e6e207a5..e48008316c1 100644 --- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc +++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc @@ -17235,6 +17235,7 @@ DROP PROCEDURE IF EXISTS sp1; --enable_warnings delimiter //; +--error ER_SP_BAD_SQLSTATE CREATE PROCEDURE sp1() BEGIN declare cond1 condition for sqlstate '00000'; @@ -17244,11 +17245,6 @@ BEGIN END// delimiter ;// -CALL sp1(); - -# cleanup -DROP PROCEDURE sp1; - # ------------------------------------------------------------------------------ let $message= Testcase 4.2.45:; @@ -17388,6 +17384,7 @@ DROP PROCEDURE IF EXISTS sp1; --enable_warnings delimiter //; +--error ER_SP_BAD_SQLSTATE CREATE PROCEDURE sp1() BEGIN declare continue handler for sqlstate '00000' set @var2 = 1; @@ -17396,12 +17393,6 @@ BEGIN END// delimiter ;// -CALL sp1(); - -# cleanup -DROP PROCEDURE sp1; - - # ------------------------------------------------------------------------------ let $message= Testcase 4.2.52:; @@ -29245,6 +29236,7 @@ DROP PROCEDURE IF EXISTS h1; --enable_warnings delimiter //; +--error ER_SP_BAD_SQLSTATE CREATE PROCEDURE h1 () BEGIN declare x1 int default 0; @@ -29320,6 +29312,7 @@ DROP PROCEDURE IF EXISTS h1; --enable_warnings delimiter //; +--error ER_SP_BAD_SQLSTATE CREATE PROCEDURE h1 () BEGIN declare x1 int default 0;