Merge bodhi.local:/opt/local/work/tmp_merge

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

mysql-test/t/sp-error.test

@@ -1709,9 +1709,31 @@ drop function if exists bug16896;
 --error ER_SP_NO_AGGREGATE
 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;
+
+
 #
 # End of 5.0 tests
 #
+--echo End of 5.0 tests
 
 #
 # Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in
@@ -1743,6 +1765,7 @@ drop function if exists bug20701|
 create function bug20701() returns varchar(25) binary return "test"|
 create function bug20701() returns varchar(25) return "test"|
 drop function bug20701|
+--echo End of 5.1 tests
 
 #
 # BUG#NNNN: New bug synopsis