Below is the list of changes that have just been committed into a local
6.0 repository of mleich. When mleich does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-02 14:26:05+02:00, mleich@stripped +18 -0
Post merge fix for
ChangeSet@stripped, 2008-04-02
Merge mleich@stripped:/home/bk/mysql-6.0-build
into five.local.lan:/work/trees/mysql-6.0-build-src-clean
MERGE: 1.2597.1.18
mysql-test/suite/funcs_1/r/falcon_storedproc.result@stripped, 2008-04-02 14:25:54+02:00, mleich@stripped +15982 -15983
Updated result
mysql-test/suite/funcs_1/r/falcon_storedproc_02.result@stripped, 2008-04-02 14:25:54+02:00, mleich@stripped +1 -6
Updated result
mysql-test/suite/funcs_1/r/falcon_views.result@stripped, 2008-04-02 14:25:54+02:00, mleich@stripped +4 -4
Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2008-04-02 14:25:55+02:00, mleich@stripped +15982 -15983
Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@stripped, 2008-04-02 14:25:56+02:00, mleich@stripped +1 -6
Updated result
mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2008-04-02 14:25:56+02:00, mleich@stripped +4 -4
Updated result
mysql-test/suite/funcs_1/r/is_columns_is.result@stripped, 2008-04-02 14:25:56+02:00, mleich@stripped +1 -1
Updated result
mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2008-04-02 14:25:56+02:00, mleich@stripped +15982 -15983
Updated result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result@stripped, 2008-04-02 14:25:57+02:00, mleich@stripped +1 -6
Updated result
mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2008-04-02 14:25:57+02:00, mleich@stripped +4 -4
Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2008-04-02 14:25:58+02:00, mleich@stripped +15982 -15983
Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@stripped, 2008-04-02 14:25:59+02:00, mleich@stripped +1 -6
Updated result
mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2008-04-02 14:25:59+02:00, mleich@stripped +8724 -8724
Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2008-04-02 14:26:00+02:00, mleich@stripped +15982 -15983
Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@stripped, 2008-04-02 14:26:01+02:00, mleich@stripped +1 -6
Updated result
mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2008-04-02 14:26:01+02:00, mleich@stripped +4 -4
Updated result
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@stripped, 2008-04-02 14:26:01+02:00, mleich@stripped +1 -3
handler for sqlstate '00000' is now disallowed
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@stripped, 2008-04-02 14:26:01+02:00, mleich@stripped +4 -27
handler for sqlstate '00000' is now disallowed
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc.result b/mysql-test/suite/funcs_1/r/falcon_storedproc.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc.result 2008-04-01 23:00:53 +02:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc.result 2008-04-02 14:25:54 +02:00
@@ -2486,7 +2486,7 @@ ERROR 42000: You have an error in your S
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE with()
SELECT * from t1 where f2=f1;
-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 'with()
+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 '()
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE write()
SELECT * from t1 where f2=f1;
@@ -5344,7 +5344,7 @@ CREATE PROCEDURE sp1()
with:BEGIN
SELECT @x;
END//
-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 'with:BEGIN
+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 ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
@@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1()
BEGIN
declare with char;
END//
-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 'with char;
+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 'char;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -11286,8 +11286,9 @@ BEGIN
declare with condition for sqlstate '02000';
declare exit handler for with set @var2 = 1;
END//
-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 'with condition for sqlstate '02000';
-declare exit handler for with set @var2 = 1' at line 3
+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 'condition for sqlstate '02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
Note 1305 PROCEDURE sp1 does not exist
@@ -13391,7 +13392,7 @@ CREATE PROCEDURE sp1( )
BEGIN
declare with handler for sqlstate '02000' set @var2 = 1;
END//
-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 'with handler for sqlstate '02000' set @var2 = 1;
+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 'handler for sqlstate '02000' set @var2 = 1;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -14230,10 +14231,7 @@ declare continue handler for cond1 set @
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.45:
--------------------------------------------------------------------------------
@@ -14308,10 +14306,7 @@ declare continue handler for sqlstate '0
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.52:
--------------------------------------------------------------------------------
@@ -23407,7 +23402,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.11.40:
--------------------------------------------------------------------------------
@@ -23444,10 +23439,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-CALL h1();
-@x x1
-0 2
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
* Testcase 3.1.2.53 (4.11.42):
* Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result 2008-04-01 23:00:53 +02:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result 2008-04-02 14:25:54 +02:00
@@ -594,14 +594,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 -Nrup a/mysql-test/suite/funcs_1/r/falcon_views.result b/mysql-test/suite/funcs_1/r/falcon_views.result
--- a/mysql-test/suite/funcs_1/r/falcon_views.result 2008-04-01 23:00:53 +02:00
+++ b/mysql-test/suite/funcs_1/r/falcon_views.result 2008-04-02 14:25:54 +02:00
@@ -3546,11 +3546,11 @@ CREATE VIEW v1 or REPLACE AS Select * fr
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 'or REPLACE AS Select * from tb2 my_table' at line 1
CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH CASCADED CHECK OPTION AS Select *
+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 'CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH LOCAL CHECK OPTION AS Select *
+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 'LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
SELECT * FROM tb2 my_table CREATE VIEW As v1;
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 'CREATE VIEW As v1' at line 1
@@ -3580,7 +3580,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH CASCADED' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION;
@@ -3609,7 +3609,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH LOCAL' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION;
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result 2008-04-01 23:00:54 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result 2008-04-02 14:25:55 +02:00
@@ -2486,7 +2486,7 @@ ERROR 42000: You have an error in your S
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE with()
SELECT * from t1 where f2=f1;
-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 'with()
+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 '()
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE write()
SELECT * from t1 where f2=f1;
@@ -5344,7 +5344,7 @@ CREATE PROCEDURE sp1()
with:BEGIN
SELECT @x;
END//
-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 'with:BEGIN
+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 ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
@@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1()
BEGIN
declare with char;
END//
-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 'with char;
+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 'char;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -11286,8 +11286,9 @@ BEGIN
declare with condition for sqlstate '02000';
declare exit handler for with set @var2 = 1;
END//
-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 'with condition for sqlstate '02000';
-declare exit handler for with set @var2 = 1' at line 3
+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 'condition for sqlstate '02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
Note 1305 PROCEDURE sp1 does not exist
@@ -13391,7 +13392,7 @@ CREATE PROCEDURE sp1( )
BEGIN
declare with handler for sqlstate '02000' set @var2 = 1;
END//
-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 'with handler for sqlstate '02000' set @var2 = 1;
+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 'handler for sqlstate '02000' set @var2 = 1;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -14230,10 +14231,7 @@ declare continue handler for cond1 set @
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.45:
--------------------------------------------------------------------------------
@@ -14308,10 +14306,7 @@ declare continue handler for sqlstate '0
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.52:
--------------------------------------------------------------------------------
@@ -23407,7 +23402,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.11.40:
--------------------------------------------------------------------------------
@@ -23444,10 +23439,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-CALL h1();
-@x x1
-0 2
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
* Testcase 3.1.2.53 (4.11.42):
* Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result 2008-04-01 13:18:24 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result 2008-04-02 14:25:56 +02:00
@@ -594,14 +594,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 -Nrup a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
--- a/mysql-test/suite/funcs_1/r/innodb_views.result 2008-04-01 20:13:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result 2008-04-02 14:25:56 +02:00
@@ -3546,11 +3546,11 @@ CREATE VIEW v1 or REPLACE AS Select * fr
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 'or REPLACE AS Select * from tb2 my_table' at line 1
CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH CASCADED CHECK OPTION AS Select *
+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 'CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH LOCAL CHECK OPTION AS Select *
+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 'LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
SELECT * FROM tb2 my_table CREATE VIEW As v1;
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 'CREATE VIEW As v1' at line 1
@@ -3580,7 +3580,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH CASCADED' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION;
@@ -3609,7 +3609,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH LOCAL' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION;
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-04-01 23:00:55 +02:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-04-02 14:25:56 +02:00
@@ -193,7 +193,7 @@ NULL information_schema REFERENTIAL_CONS
NULL information_schema REFERENTIAL_CONSTRAINTS REFERENCED_TABLE_NAME 11 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema REFERENTIAL_CONSTRAINTS TABLE_NAME 10 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_CATALOG 4 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
-NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_NAME 6 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_NAME 6 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema REFERENTIAL_CONSTRAINTS UNIQUE_CONSTRAINT_SCHEMA 5 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema REFERENTIAL_CONSTRAINTS UPDATE_RULE 8 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema ROUTINES CHARACTER_MAXIMUM_LENGTH 7 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result 2008-04-01 23:00:56 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result 2008-04-02 14:25:56 +02:00
@@ -2486,7 +2486,7 @@ ERROR 42000: You have an error in your S
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE with()
SELECT * from t1 where f2=f1;
-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 'with()
+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 '()
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE write()
SELECT * from t1 where f2=f1;
@@ -5344,7 +5344,7 @@ CREATE PROCEDURE sp1()
with:BEGIN
SELECT @x;
END//
-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 'with:BEGIN
+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 ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
@@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1()
BEGIN
declare with char;
END//
-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 'with char;
+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 'char;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -11286,8 +11286,9 @@ BEGIN
declare with condition for sqlstate '02000';
declare exit handler for with set @var2 = 1;
END//
-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 'with condition for sqlstate '02000';
-declare exit handler for with set @var2 = 1' at line 3
+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 'condition for sqlstate '02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
Note 1305 PROCEDURE sp1 does not exist
@@ -13391,7 +13392,7 @@ CREATE PROCEDURE sp1( )
BEGIN
declare with handler for sqlstate '02000' set @var2 = 1;
END//
-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 'with handler for sqlstate '02000' set @var2 = 1;
+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 'handler for sqlstate '02000' set @var2 = 1;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -14230,10 +14231,7 @@ declare continue handler for cond1 set @
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.45:
--------------------------------------------------------------------------------
@@ -14308,10 +14306,7 @@ declare continue handler for sqlstate '0
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.52:
--------------------------------------------------------------------------------
@@ -23407,7 +23402,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.11.40:
--------------------------------------------------------------------------------
@@ -23444,10 +23439,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-CALL h1();
-@x x1
-0 2
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
* Testcase 3.1.2.53 (4.11.42):
* Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result 2008-04-01 13:18:25 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result 2008-04-02 14:25:57 +02:00
@@ -594,14 +594,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 -Nrup a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
--- a/mysql-test/suite/funcs_1/r/memory_views.result 2008-04-01 20:13:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_views.result 2008-04-02 14:25:57 +02:00
@@ -3546,11 +3546,11 @@ CREATE VIEW v1 or REPLACE AS Select * fr
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 'or REPLACE AS Select * from tb2 my_table' at line 1
CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH CASCADED CHECK OPTION AS Select *
+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 'CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH LOCAL CHECK OPTION AS Select *
+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 'LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
SELECT * FROM tb2 my_table CREATE VIEW As v1;
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 'CREATE VIEW As v1' at line 1
@@ -3580,7 +3580,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH CASCADED' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION;
@@ -3609,7 +3609,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH LOCAL' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION;
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result 2008-04-01 23:00:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result 2008-04-02 14:25:58 +02:00
@@ -2486,7 +2486,7 @@ ERROR 42000: You have an error in your S
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE with()
SELECT * from t1 where f2=f1;
-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 'with()
+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 '()
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE write()
SELECT * from t1 where f2=f1;
@@ -5344,7 +5344,7 @@ CREATE PROCEDURE sp1()
with:BEGIN
SELECT @x;
END//
-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 'with:BEGIN
+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 ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
@@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1()
BEGIN
declare with char;
END//
-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 'with char;
+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 'char;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -11286,8 +11286,9 @@ BEGIN
declare with condition for sqlstate '02000';
declare exit handler for with set @var2 = 1;
END//
-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 'with condition for sqlstate '02000';
-declare exit handler for with set @var2 = 1' at line 3
+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 'condition for sqlstate '02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
Note 1305 PROCEDURE sp1 does not exist
@@ -13391,7 +13392,7 @@ CREATE PROCEDURE sp1( )
BEGIN
declare with handler for sqlstate '02000' set @var2 = 1;
END//
-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 'with handler for sqlstate '02000' set @var2 = 1;
+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 'handler for sqlstate '02000' set @var2 = 1;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -14230,10 +14231,7 @@ declare continue handler for cond1 set @
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.45:
--------------------------------------------------------------------------------
@@ -14308,10 +14306,7 @@ declare continue handler for sqlstate '0
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.52:
--------------------------------------------------------------------------------
@@ -23407,7 +23402,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.11.40:
--------------------------------------------------------------------------------
@@ -23444,10 +23439,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-CALL h1();
-@x x1
-0 2
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
* Testcase 3.1.2.53 (4.11.42):
* Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result 2008-04-01 13:18:27 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result 2008-04-02 14:25:59 +02:00
@@ -594,14 +594,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 -Nrup a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
--- a/mysql-test/suite/funcs_1/r/myisam_views.result 2008-04-01 23:00:58 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result 2008-04-02 14:25:59 +02:00
@@ -4048,11 +4048,11 @@ CREATE VIEW v1 or REPLACE AS Select * fr
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 'or REPLACE AS Select * from tb2 my_table' at line 1
CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH CASCADED CHECK OPTION AS Select *
+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 'CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH LOCAL CHECK OPTION AS Select *
+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 'LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
SELECT * FROM tb2 my_table CREATE VIEW As v1;
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 'CREATE VIEW As v1' at line 1
@@ -4082,7 +4082,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH CASCADED' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION;
@@ -4111,7 +4111,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH LOCAL' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result 2008-04-01 23:01:00 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result 2008-04-02 14:26:00 +02:00
@@ -2486,7 +2486,7 @@ ERROR 42000: You have an error in your S
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE with()
SELECT * from t1 where f2=f1;
-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 'with()
+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 '()
SELECT * from t1 where f2=f1' at line 1
CREATE PROCEDURE write()
SELECT * from t1 where f2=f1;
@@ -5344,7 +5344,7 @@ CREATE PROCEDURE sp1()
with:BEGIN
SELECT @x;
END//
-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 'with:BEGIN
+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 ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
@@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1()
BEGIN
declare with char;
END//
-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 'with char;
+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 'char;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -11286,8 +11286,9 @@ BEGIN
declare with condition for sqlstate '02000';
declare exit handler for with set @var2 = 1;
END//
-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 'with condition for sqlstate '02000';
-declare exit handler for with set @var2 = 1' at line 3
+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 'condition for sqlstate '02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
Note 1305 PROCEDURE sp1 does not exist
@@ -13391,7 +13392,7 @@ CREATE PROCEDURE sp1( )
BEGIN
declare with handler for sqlstate '02000' set @var2 = 1;
END//
-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 'with handler for sqlstate '02000' set @var2 = 1;
+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 'handler for sqlstate '02000' set @var2 = 1;
END' at line 3
DROP PROCEDURE IF EXISTS sp1;
Warnings:
@@ -14230,10 +14231,7 @@ declare continue handler for cond1 set @
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.45:
--------------------------------------------------------------------------------
@@ -14308,10 +14306,7 @@ declare continue handler for sqlstate '0
set @x=1;
SELECT @var2;
END//
-CALL sp1();
-@var2
-NULL
-DROP PROCEDURE sp1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.2.52:
--------------------------------------------------------------------------------
@@ -23407,7 +23402,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
Testcase 4.11.40:
--------------------------------------------------------------------------------
@@ -23444,10 +23439,7 @@ set x1 = 2;
END;
SELECT @x, x1;
END//
-CALL h1();
-@x x1
-0 2
-DROP PROCEDURE IF EXISTS h1;
+ERROR 42000: Bad SQLSTATE: '00000'
* Testcase 3.1.2.53 (4.11.42):
* Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result 2008-04-01 13:18:29 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result 2008-04-02 14:26:01 +02:00
@@ -594,14 +594,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 -Nrup a/mysql-test/suite/funcs_1/r/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
--- a/mysql-test/suite/funcs_1/r/ndb_views.result 2008-04-01 20:13:58 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result 2008-04-02 14:26:01 +02:00
@@ -3546,11 +3546,11 @@ CREATE VIEW v1 or REPLACE AS Select * fr
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 'or REPLACE AS Select * from tb2 my_table' at line 1
CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH CASCADED CHECK OPTION AS Select *
+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 'CASCADED CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50;
-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 'WITH LOCAL CHECK OPTION AS Select *
+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 'LOCAL CHECK OPTION AS Select *
from tb2 my_table limit 50' at line 1
SELECT * FROM tb2 my_table CREATE VIEW As v1;
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 'CREATE VIEW As v1' at line 1
@@ -3580,7 +3580,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH CASCADED' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION;
@@ -3609,7 +3609,7 @@ FROM test.tb2 my_table CHECK OPTION WITH
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 'CHECK OPTION WITH LOCAL' at line 2
CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table;
-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 'WITH CASCADED CHECK OPTION
+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 'CASCADED CHECK OPTION
AS SELECT F59, F60 FROM test.tb2 my_table' at line 1
CREATE OR REPLACE AS SELECT F59, F60
FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION;
diff -Nrup a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc 2008-04-01 13:18:29 +02:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc 2008-04-02 14:26:01 +02:00
@@ -810,6 +810,7 @@ CALL h1();
delimiter //;
+--error ER_SP_BAD_SQLSTATE
CREATE PROCEDURE sp1()
begin1_label:BEGIN
declare exit handler for sqlstate '00000' set @var1 = 5;
@@ -823,12 +824,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 -Nrup a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc 2008-04-01 20:13:58 +02:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc 2008-04-02 14:26:01 +02:00
@@ -17231,6 +17231,7 @@ DROP PROCEDURE IF EXISTS sp1;
--enable_warnings
delimiter //;
+--error ER_SP_BAD_SQLSTATE
CREATE PROCEDURE sp1()
BEGIN
declare cond1 condition for sqlstate '00000';
@@ -17240,11 +17241,6 @@ BEGIN
END//
delimiter ;//
-CALL sp1();
-
-# cleanup
-DROP PROCEDURE sp1;
-
# ------------------------------------------------------------------------------
let $message= Testcase 4.2.45:;
@@ -17384,6 +17380,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;
@@ -17392,12 +17389,6 @@ BEGIN
END//
delimiter ;//
-CALL sp1();
-
-# cleanup
-DROP PROCEDURE sp1;
-
-
# ------------------------------------------------------------------------------
let $message= Testcase 4.2.52:;
@@ -29244,6 +29235,7 @@ DROP PROCEDURE IF EXISTS h1;
--enable_warnings
delimiter //;
+--error ER_SP_BAD_SQLSTATE
CREATE PROCEDURE h1 ()
BEGIN
declare x1 int default 0;
@@ -29257,15 +29249,6 @@ BEGIN
END//
delimiter ;//
-# cleanup
---disable_warnings
-DROP PROCEDURE IF EXISTS h1;
---enable_warnings
-
-
-
-
-
# ------------------------------------------------------------------------------
let $message= Testcase 4.11.40:;
@@ -29319,6 +29302,7 @@ DROP PROCEDURE IF EXISTS h1;
--enable_warnings
delimiter //;
+--error ER_SP_BAD_SQLSTATE
CREATE PROCEDURE h1 ()
BEGIN
declare x1 int default 0;
@@ -29331,13 +29315,6 @@ BEGIN
SELECT @x, x1;
END//
delimiter ;//
-
-CALL h1();
-
-# cleanup
---disable_warnings
-DROP PROCEDURE IF EXISTS h1;
---enable_warnings
# ------------------------------------------------------------------------------
| Thread |
|---|
| • bk commit into 6.0 tree (mleich:1.2621) | mleich | 2 Apr |
