Fix for bug#20701 BINARY keyword should be forbidden in stored routines

    
create function func() returns char(10) binary ...
is no more possible. This will be reenabled when 
bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
is fixed.

Fix after 2nd review


mysql-test/r/sp-error.result:
  update result
mysql-test/r/sp.result:
  update result
mysql-test/t/sp-error.test:
  add a test case for bug#20701 BINARY keyword should be forbidden in stored procedures
mysql-test/t/sp.test:
  Fix test case which uses binary for the return value of a function.
  It's no more possible after fix for bug#20701 
  BINARY keyword should be forbidden in SP
  
  Fix few glitches where ; is used instead of | . The delimiter is |
sql/sql_yacc.yy:
  Fix for bug#20701 BINARY keyword should be forbidden in stored routines
  
  create function func() returns char(10) binary ...
  is no more possible. This will be reenabled when 
  bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
  is fixed

1 files changed, 18 insertions, 0 deletions

diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index d370cb3037c..73a64b6feeb 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -1729,9 +1729,27 @@ begin
 end|
 
 #
+# BUG#20701: BINARY keyword should be forbidden in stored routines
+#
+--disable_warnings
+drop function if exists bug20701|
+--enable_warnings
+#
+# This was disabled in 5.1.12. See bug #20701
+# When collation support in SP is implemented, then this test should
+# 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|
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings
 #drop procedure if exists bugNNNN|
+#drop function if exists bugNNNN|
 #--enable_warnings
 #create procedure bugNNNN...
+#create function bugNNNN...