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.

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

@@ -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_02.result

@@ -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/myisam_storedproc_02.result

@@ -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/ndb_storedproc_02.result

@@ -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/storedproc/storedproc_02.inc

@@ -808,7 +808,8 @@ delimiter ;//
 
 CALL h1();
 
-
+--echo This will fail, SQLSTATE 00000 is not allowed
+--ERROR ER_SP_BAD_SQLSTATE
 delimiter //;
 CREATE PROCEDURE sp1()
    begin1_label:BEGIN
@@ -823,12 +824,16 @@ CREATE PROCEDURE sp1()
    END begin1_label//
 delimiter ;//
 
+--echo Verify SP wasn't created
+--ERROR ER_SP_DOES_NOT_EXIST
 CALL sp1();
 
 # cleanup 3.1.2.45+50
 DROP PROCEDURE p1;
 DROP PROCEDURE h1;
-DROP PROCEDURE sp1;
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
 DROP TABLE res_t1;
 
 

mysql-test/suite/funcs_1/storedproc/storedproc_master.inc

@@ -17230,7 +17230,10 @@ let $message= Testcase 4.2.43:;
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
+--echo expect failure, SQLSTATE 00000 is not an acceptable value
+--echo for an SP's handler
 delimiter //;
+--ERROR ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '00000';
@@ -17240,11 +17243,14 @@ BEGIN
 END//
 delimiter ;//
 
+--echo ensure SP doesn't exist
+--ERROR ER_SP_DOES_NOT_EXIST
 CALL sp1();
 
 # cleanup
-DROP PROCEDURE sp1;
-
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.2.45:;
@@ -17383,6 +17389,8 @@ let $message= Testcase 4.2.48:;
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
+--echo This creation should fail, SQLSTATE 00000 is unacceptable
+--ERROR ER_SP_BAD_SQLSTATE
 delimiter //;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -17392,11 +17400,14 @@ BEGIN
 END//
 delimiter ;//
 
+--echo Verify SP wasn't created
+--ERROR ER_SP_DOES_NOT_EXIST
 CALL sp1();
 
 # cleanup
-DROP PROCEDURE sp1;
-
+--disable_warnings
+DROP PROCEDURE IF EXISTSsp1;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------