database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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_func_view.result:
  Update result set for changes to SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated result set due to changes in SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated result set due to changes in SHOW CREATE VIEW output
This commit is contained in:
Patrick Crews
2008-05-27 19:30:07 -04:00
parent 52066c5131
commit 914bb34b38
13 changed files with 1668 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1044
mysql-test/suite/funcs_1/r/innodb_func_view.result
View File

File diff suppressed because it is too large Load Diff

23
mysql-test/suite/funcs_1/r/innodb_storedproc.result
View File

@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'
Testcase 4.2.43: Testcase 4.2.43:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
expect failure, SQLSTATE 00000 is not an acceptable value
for an SP's handler
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare cond1 condition for sqlstate '00000'; declare cond1 condition for sqlstate '00000';
@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
ensure SP doesn't exist
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTS sp1;
DROP PROCEDURE sp1;
Testcase 4.2.45: Testcase 4.2.45:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'
Testcase 4.2.48: Testcase 4.2.48:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
This creation should fail, SQLSTATE 00000 is unacceptable
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare continue handler for sqlstate '00000' set @var2 = 1; declare continue handler for sqlstate '00000' set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTSsp1;
DROP PROCEDURE sp1; 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: Testcase 4.2.52:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -23502,6 +23508,7 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
Testcase 4.11.40: Testcase 4.11.40:
@ -23539,9 +23546,9 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
CALL h1(); CALL h1();
@x x1 ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
0 2
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
* Testcase 3.1.2.53 (4.11.42): * Testcase 3.1.2.53 (4.11.42):

10
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
View File

@ -583,6 +583,7 @@ END//
CALL h1(); CALL h1();
x1 x2 x3 x4 x5 x6 x1 x2 x3 x4 x5 x6
1 1 1 1 1 1 1 1 1 1 1 1
This will fail, SQLSTATE 00000 is not allowed
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
begin1_label:BEGIN begin1_label:BEGIN
declare exit handler for sqlstate '00000' set @var1 = 5; declare exit handler for sqlstate '00000' set @var1 = 5;
@ -594,14 +595,13 @@ SELECT @var3, @var4;
END begin2_label; END begin2_label;
SELECT @var1, @var2; SELECT @var1, @var2;
END begin1_label// END begin1_label//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var3 @var4 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL 8
@var1 @var2
NULL 6
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP PROCEDURE h1; DROP PROCEDURE h1;
DROP PROCEDURE sp1; DROP PROCEDURE IF EXISTS sp1;
DROP TABLE res_t1; DROP TABLE res_t1;
Testcase 3.1.2.50: Testcase 3.1.2.50:

1044
mysql-test/suite/funcs_1/r/memory_func_view.result
View File

File diff suppressed because it is too large Load Diff

23
mysql-test/suite/funcs_1/r/memory_storedproc.result
View File

@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'
Testcase 4.2.43: Testcase 4.2.43:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
expect failure, SQLSTATE 00000 is not an acceptable value
for an SP's handler
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare cond1 condition for sqlstate '00000'; declare cond1 condition for sqlstate '00000';
@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
ensure SP doesn't exist
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTS sp1;
DROP PROCEDURE sp1;
Testcase 4.2.45: Testcase 4.2.45:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'
Testcase 4.2.48: Testcase 4.2.48:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
This creation should fail, SQLSTATE 00000 is unacceptable
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare continue handler for sqlstate '00000' set @var2 = 1; declare continue handler for sqlstate '00000' set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTSsp1;
DROP PROCEDURE sp1; 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: Testcase 4.2.52:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -23502,6 +23508,7 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
Testcase 4.11.40: Testcase 4.11.40:
@ -23539,9 +23546,9 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
CALL h1(); CALL h1();
@x x1 ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
0 2
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
* Testcase 3.1.2.53 (4.11.42): * Testcase 3.1.2.53 (4.11.42):

10
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
View File

@ -583,6 +583,7 @@ END//
CALL h1(); CALL h1();
x1 x2 x3 x4 x5 x6 x1 x2 x3 x4 x5 x6
1 1 1 1 1 1 1 1 1 1 1 1
This will fail, SQLSTATE 00000 is not allowed
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
begin1_label:BEGIN begin1_label:BEGIN
declare exit handler for sqlstate '00000' set @var1 = 5; declare exit handler for sqlstate '00000' set @var1 = 5;
@ -594,14 +595,13 @@ SELECT @var3, @var4;
END begin2_label; END begin2_label;
SELECT @var1, @var2; SELECT @var1, @var2;
END begin1_label// END begin1_label//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var3 @var4 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL 8
@var1 @var2
NULL 6
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP PROCEDURE h1; DROP PROCEDURE h1;
DROP PROCEDURE sp1; DROP PROCEDURE IF EXISTS sp1;
DROP TABLE res_t1; DROP TABLE res_t1;
Testcase 3.1.2.50: Testcase 3.1.2.50:

1044
mysql-test/suite/funcs_1/r/myisam_func_view.result
View File

File diff suppressed because it is too large Load Diff

23
mysql-test/suite/funcs_1/r/myisam_storedproc.result
View File

@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'
Testcase 4.2.43: Testcase 4.2.43:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
expect failure, SQLSTATE 00000 is not an acceptable value
for an SP's handler
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare cond1 condition for sqlstate '00000'; declare cond1 condition for sqlstate '00000';
@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
ensure SP doesn't exist
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTS sp1;
DROP PROCEDURE sp1;
Testcase 4.2.45: Testcase 4.2.45:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'
Testcase 4.2.48: Testcase 4.2.48:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
This creation should fail, SQLSTATE 00000 is unacceptable
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare continue handler for sqlstate '00000' set @var2 = 1; declare continue handler for sqlstate '00000' set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTSsp1;
DROP PROCEDURE sp1; 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: Testcase 4.2.52:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -23502,6 +23508,7 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
Testcase 4.11.40: Testcase 4.11.40:
@ -23539,9 +23546,9 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
CALL h1(); CALL h1();
@x x1 ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
0 2
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
* Testcase 3.1.2.53 (4.11.42): * Testcase 3.1.2.53 (4.11.42):

10
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
View File

@ -583,6 +583,7 @@ END//
CALL h1(); CALL h1();
x1 x2 x3 x4 x5 x6 x1 x2 x3 x4 x5 x6
1 1 1 1 1 1 1 1 1 1 1 1
This will fail, SQLSTATE 00000 is not allowed
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
begin1_label:BEGIN begin1_label:BEGIN
declare exit handler for sqlstate '00000' set @var1 = 5; declare exit handler for sqlstate '00000' set @var1 = 5;
@ -594,14 +595,13 @@ SELECT @var3, @var4;
END begin2_label; END begin2_label;
SELECT @var1, @var2; SELECT @var1, @var2;
END begin1_label// END begin1_label//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var3 @var4 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL 8
@var1 @var2
NULL 6
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP PROCEDURE h1; DROP PROCEDURE h1;
DROP PROCEDURE sp1; DROP PROCEDURE IF EXISTS sp1;
DROP TABLE res_t1; DROP TABLE res_t1;
Testcase 3.1.2.50: Testcase 3.1.2.50:

23
mysql-test/suite/funcs_1/r/ndb_storedproc.result
View File

@ -14310,6 +14310,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'
Testcase 4.2.43: Testcase 4.2.43:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
expect failure, SQLSTATE 00000 is not an acceptable value
for an SP's handler
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare cond1 condition for sqlstate '00000'; declare cond1 condition for sqlstate '00000';
@ -14317,10 +14319,11 @@ declare continue handler for cond1 set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
ensure SP doesn't exist
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTS sp1;
DROP PROCEDURE sp1;
Testcase 4.2.45: Testcase 4.2.45:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -14389,16 +14392,19 @@ ERROR 42000: Bad SQLSTATE: '42s0200test'
Testcase 4.2.48: Testcase 4.2.48:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp1; DROP PROCEDURE IF EXISTS sp1;
This creation should fail, SQLSTATE 00000 is unacceptable
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
BEGIN BEGIN
declare continue handler for sqlstate '00000' set @var2 = 1; declare continue handler for sqlstate '00000' set @var2 = 1;
set @x=1; set @x=1;
SELECT @var2; SELECT @var2;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var2 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL DROP PROCEDURE IF EXISTSsp1;
DROP PROCEDURE sp1; 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: Testcase 4.2.52:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -23502,6 +23508,7 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
Testcase 4.11.40: Testcase 4.11.40:
@ -23539,9 +23546,9 @@ set x1 = 2;
END; END;
SELECT @x, x1; SELECT @x, x1;
END// END//
ERROR 42000: Bad SQLSTATE: '00000'
CALL h1(); CALL h1();
@x x1 ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
0 2
DROP PROCEDURE IF EXISTS h1; DROP PROCEDURE IF EXISTS h1;
* Testcase 3.1.2.53 (4.11.42): * Testcase 3.1.2.53 (4.11.42):

10
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
View File

@ -583,6 +583,7 @@ END//
CALL h1(); CALL h1();
x1 x2 x3 x4 x5 x6 x1 x2 x3 x4 x5 x6
1 1 1 1 1 1 1 1 1 1 1 1
This will fail, SQLSTATE 00000 is not allowed
CREATE PROCEDURE sp1() CREATE PROCEDURE sp1()
begin1_label:BEGIN begin1_label:BEGIN
declare exit handler for sqlstate '00000' set @var1 = 5; declare exit handler for sqlstate '00000' set @var1 = 5;
@ -594,14 +595,13 @@ SELECT @var3, @var4;
END begin2_label; END begin2_label;
SELECT @var1, @var2; SELECT @var1, @var2;
END begin1_label// END begin1_label//
ERROR 42000: Bad SQLSTATE: '00000'
Verify SP wasn't created
CALL sp1(); CALL sp1();
@var3 @var4 ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
NULL 8
@var1 @var2
NULL 6
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP PROCEDURE h1; DROP PROCEDURE h1;
DROP PROCEDURE sp1; DROP PROCEDURE IF EXISTS sp1;
DROP TABLE res_t1; DROP TABLE res_t1;
Testcase 3.1.2.50: Testcase 3.1.2.50:

9
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
View File

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

19
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
View File

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