Fix after manual merge.

mysql-test/r/sp-error.result:
  After merge fix.
mysql-test/t/sp-error.test:
  Fix delimiter restoration.

mysql-test/r/sp-error.result

@@ -1258,9 +1258,9 @@ show authors;
 return 42;
 end|
 ERROR 0A000: Not allowed to return a result set from a function
-drop function if exists bug20701|
-create function bug20701() returns varchar(25) binary return "test"|
+drop function if exists bug20701;
+create function bug20701() returns varchar(25) binary return "test";
 ERROR 42000: This version of MySQL doesn't yet support 'return value collation'
-create function bug20701() returns varchar(25) return "test"|
-drop function bug20701|
+create function bug20701() returns varchar(25) return "test";
+drop function bug20701;
 End of 5.1 tests

mysql-test/t/sp-error.test

@@ -1769,27 +1769,6 @@ BEGIN
 END;
 
 
-#
-# End of 5.0 tests
-#
---echo End of 5.0 tests
-
-#
-# Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in
-# stored functions/triggers
-#
---disable_warnings
-drop function if exists bug16164;
---enable_warnings
-delimiter |;
---error ER_SP_NO_RETSET
-create function bug16164() returns int
-begin
-  show authors;
-  return 42;
-end|
-
-
 #
 # BUG#20953: create proc with a create view that uses local
 # vars/params should fail to create
@@ -1831,11 +1810,33 @@ PREPARE stmt FROM "CREATE VIEW v AS SELECT ?";
 DROP TABLE t1;
 
 
+#
+# End of 5.0 tests
+#
+--echo End of 5.0 tests
+
+#
+# Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in
+# stored functions/triggers
+#
+--disable_warnings
+drop function if exists bug16164;
+--enable_warnings
+delimiter |;
+--error ER_SP_NO_RETSET
+create function bug16164() returns int
+begin
+  show authors;
+  return 42;
+end|
+delimiter ;|
+
+
 #
 # BUG#20701: BINARY keyword should be forbidden in stored routines
 #
 --disable_warnings
-drop function if exists bug20701|
+drop function if exists bug20701;
 --enable_warnings
 #
 # This was disabled in 5.1.12. See bug #20701
@@ -1843,17 +1844,19 @@ drop function if exists bug20701|
 # be removed.
 #
 --error ER_NOT_SUPPORTED_YET
-create function bug20701() returns varchar(25) binary return "test"|
-create function bug20701() returns varchar(25) return "test"|
-drop function 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
 #
 #--disable_warnings
-#drop procedure if exists bugNNNN|
-#drop function if exists bugNNNN|
+#drop procedure if exists bugNNNN;
+#drop function if exists bugNNNN;
 #--enable_warnings
 #create procedure bugNNNN...
 #create function bugNNNN...