Commit e856d953 authored by Patrick Crews's avatar Patrick Crews
Browse files

Bug#36721 - Test funcs1.<engine>_func_view failing for multiple engines 

Bug#36724 - Test funcs_1.<engine>_storedproc_02 needs to be updated
Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on 5.1+

func_view bug:  re-records .result files to account for addition of charset and collation data 
                to SHOW CREATE VIEW output
storedproc bugs:  Added expected errors for those storedprocs that use SQLSTATE:00000
                  in their handlers.  re-recorded .result files to account for these
                  expected errors.
parent 6e761b19

mysql-test/suite/funcs_1/r/innodb_storedproc.result

+15 −8
Original line number Diff line number Diff line
@@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03' 
Testcase 4.2.43:

--------------------------------------------------------------------------------

DROP PROCEDURE IF EXISTS sp1;

expect failure, SQLSTATE 00000 is not an acceptable value

for an SP's handler

CREATE PROCEDURE sp1()

BEGIN

declare cond1 condition for sqlstate '00000';
@@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1; 
set @x=1;

SELECT @var2;

END//

ERROR 42000: Bad SQLSTATE: '00000'

ensure SP doesn't exist

CALL sp1();

@var2

NULL

DROP PROCEDURE sp1;

ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist

DROP PROCEDURE IF EXISTS sp1;









Testcase 4.2.45:









--------------------------------------------------------------------------------








@@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'







Testcase 4.2.48:









--------------------------------------------------------------------------------









DROP PROCEDURE IF EXISTS sp1;









This creation should fail, SQLSTATE 00000 is unacceptable









CREATE PROCEDURE sp1()









BEGIN









declare continue handler for sqlstate '00000'  set @var2 = 1;









set @x=1;









SELECT @var2;









END//









ERROR 42000: Bad SQLSTATE: '00000'









Verify SP wasn't created









CALL sp1();









@var2









NULL









DROP PROCEDURE sp1;









ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist









DROP PROCEDURE IF EXISTSsp1;









ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXISTSsp1' at line 1

















Testcase 4.2.52:









--------------------------------------------------------------------------------








@@ -23502,6 +23508,7 @@ set x1 = 2;







END;









SELECT @x, x1;









END//









ERROR 42000: Bad SQLSTATE: '00000'









DROP PROCEDURE IF EXISTS h1;

















Testcase 4.11.40:








@@ -23539,9 +23546,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):

























mysql-test/suite/funcs_1/r/innodb_storedproc_02.result



+5
−5






























Original line number
Diff line number
Diff line







@@ -583,6 +583,7 @@ END//







CALL h1();









x1	x2	x3	x4	x5	x6









1	1	1	1	1	1









This will fail, SQLSTATE 00000 is not allowed









CREATE PROCEDURE sp1()









begin1_label:BEGIN









declare exit handler for sqlstate '00000' set @var1 = 5;








@@ -594,14 +595,13 @@ SELECT @var3, @var4;







END begin2_label;









SELECT @var1, @var2;









END begin1_label//









ERROR 42000: Bad SQLSTATE: '00000'









Verify SP wasn't created









CALL sp1();









@var3	@var4









NULL	8









@var1	@var2









NULL	6









ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist









DROP PROCEDURE p1;









DROP PROCEDURE h1;









DROP PROCEDURE sp1;









DROP PROCEDURE IF EXISTS sp1;









DROP TABLE res_t1;



















Testcase 3.1.2.50:




































mysql-test/suite/funcs_1/r/memory_storedproc.result



+15
−8






























Original line number
Diff line number
Diff line







@@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'







Testcase 4.2.43:









--------------------------------------------------------------------------------









DROP PROCEDURE IF EXISTS sp1;









expect failure, SQLSTATE 00000 is not an acceptable value









for an SP's handler









CREATE PROCEDURE sp1()









BEGIN









declare cond1 condition for sqlstate '00000';








@@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1;







set @x=1;









SELECT @var2;









END//









ERROR 42000: Bad SQLSTATE: '00000'









ensure SP doesn't exist









CALL sp1();









@var2









NULL









DROP PROCEDURE sp1;









ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist









DROP PROCEDURE IF EXISTS sp1;

















Testcase 4.2.45:









--------------------------------------------------------------------------------








@@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'







Testcase 4.2.48:









--------------------------------------------------------------------------------









DROP PROCEDURE IF EXISTS sp1;









This creation should fail, SQLSTATE 00000 is unacceptable









CREATE PROCEDURE sp1()









BEGIN









declare continue handler for sqlstate '00000'  set @var2 = 1;









set @x=1;









SELECT @var2;









END//









ERROR 42000: Bad SQLSTATE: '00000'









Verify SP wasn't created









CALL sp1();









@var2









NULL









DROP PROCEDURE sp1;









ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist









DROP PROCEDURE IF EXISTSsp1;









ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXISTSsp1' at line 1

















Testcase 4.2.52:









--------------------------------------------------------------------------------








@@ -23502,6 +23508,7 @@ set x1 = 2;







END;









SELECT @x, x1;









END//









ERROR 42000: Bad SQLSTATE: '00000'









DROP PROCEDURE IF EXISTS h1;

















Testcase 4.11.40:








@@ -23539,9 +23546,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):