bzr commit into mysql-6.0-codebase-bugfixing branch (kostja:3721) Bug#8759

[Konstantin Osipov]

#At file:///opt/local/work/6.0-codebase/ based on revid:kostja@stripped

 3721 Konstantin Osipov	2009-11-21
      Remove a duplicate test for Bug#8759 from sp-error.test (bad merge).
     @ mysql-test/r/sp-error.result
        Remove a duplicate test for Bug#8759 from sp-error.test (bad merge).
     @ mysql-test/t/sp-error.test
        Remove a duplicate test for Bug#8759 (bad merge).

    modified:
      mysql-test/r/sp-error.result
      mysql-test/t/sp-error.test
=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2009-11-20 12:49:47 +0000
+++ b/mysql-test/r/sp-error.result	2009-11-20 22:41:00 +0000
@@ -1667,18 +1667,6 @@ end|
 call p1(1);
 set @@max_sp_recursion_depth = @old_recursion_depth;
 drop procedure p1;
-drop procedure if exists proc_8759;
-create procedure proc_8759()
-begin
-declare should_be_illegal condition for sqlstate '00000';
-declare continue handler for should_be_illegal set @x=0;
-end$$
-ERROR 42000: Bad SQLSTATE: '00000'
-create procedure proc_8759()
-begin
-declare continue handler for sqlstate '00000' set @x=0;
-end$$
-ERROR 42000: Bad SQLSTATE: '00000'
 LOAD DATA INFILE '../../tmp/proc.txt' INTO TABLE mysql.proc;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,1), (2,2);

=== modified file 'mysql-test/t/sp-error.test'
--- a/mysql-test/t/sp-error.test	2009-11-20 12:49:47 +0000
+++ b/mysql-test/t/sp-error.test	2009-11-20 22:41:00 +0000
@@ -2464,32 +2464,6 @@ set @@max_sp_recursion_depth = @old_recu
 drop procedure p1;
 
 #
-# Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)
-#
-
---disable_warnings
-drop procedure if exists proc_8759;
---enable_warnings
-
-delimiter $$;
-
---error ER_SP_BAD_SQLSTATE
-create procedure proc_8759()
-begin
-  declare should_be_illegal condition for sqlstate '00000';
-  declare continue handler for should_be_illegal set @x=0;
-end$$
-
---error ER_SP_BAD_SQLSTATE
-create procedure proc_8759()
-begin
-  declare continue handler for sqlstate '00000' set @x=0;
-end$$
-
-delimiter ;$$
-
-
-#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings


Attachment: [text/bzr-bundle] bzr/[e-mail]