summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp-error.test
diff options
context:
space:
mode:
authorunknown <kroki/tomash@moonlight.intranet>2006-10-12 19:36:43 +0400
committerunknown <kroki/tomash@moonlight.intranet>2006-10-12 19:36:43 +0400
commit1c1fd2a46ef95d556a78a34bfcf3525e8d598cb4 (patch)
treeadf3b7a307f1b026d435eead791d795c426c8a69 /mysql-test/t/sp-error.test
parent649f3d54795941a7bff31b022afab7cedcf23201 (diff)
downloadmariadb-git-1c1fd2a46ef95d556a78a34bfcf3525e8d598cb4.tar.gz
Fix after manual merge.
mysql-test/t/sp-error.test: Move test for bug#20953 to the end of file.
Diffstat (limited to 'mysql-test/t/sp-error.test')
-rw-r--r--mysql-test/t/sp-error.test43
1 files changed, 21 insertions, 22 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 058c45f7f2f..7dbf64e35c1 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -1745,6 +1745,27 @@ drop function if exists bug16896;
create aggregate function bug16896() returns int return 1;
+#
+# BUG#14702: misleading error message when syntax error in CREATE
+# PROCEDURE
+#
+# Misleading error message was given when IF NOT EXISTS was used in
+# CREATE PROCEDURE.
+#
+--disable_warnings
+DROP PROCEDURE IF EXISTS bug14702;
+--enable_warnings
+
+--error ER_PARSE_ERROR
+CREATE IF NOT EXISTS PROCEDURE bug14702()
+BEGIN
+END;
+
+--error ER_PARSE_ERROR
+CREATE PROCEDURE IF NOT EXISTS bug14702()
+BEGIN
+END;
+
#
# BUG#20953: create proc with a create view that uses local
@@ -1788,28 +1809,6 @@ DROP TABLE t1;
#
-# BUG#14702: misleading error message when syntax error in CREATE
-# PROCEDURE
-#
-# Misleading error message was given when IF NOT EXISTS was used in
-# CREATE PROCEDURE.
-#
---disable_warnings
-DROP PROCEDURE IF EXISTS bug14702;
---enable_warnings
-
---error ER_PARSE_ERROR
-CREATE IF NOT EXISTS PROCEDURE bug14702()
-BEGIN
-END;
-
---error ER_PARSE_ERROR
-CREATE PROCEDURE IF NOT EXISTS bug14702()
-BEGIN
-END;
-
-
-#
# BUG#NNNN: New bug synopsis
#
#--disable_warnings