Bug#9775 - Stored procedures: crash if create function that returns enum or set

  Fix bug and implement return type casting.

1 files changed, 22 insertions, 1 deletions

diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 6c833b14482..9f76f7ec0e4 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -3643,7 +3643,7 @@ drop function bug9102|
 # BUG#7648: Stored procedure crash when invoking a function that returns a bit
 #
 --disable_warnings
-drop procedure if exists bug7648|
+drop function if exists bug7648|
 --enable_warnings
 create function bug7648() returns bit(8) return 'a'|
 select bug7648()|
@@ -3651,6 +3651,27 @@ drop function bug7648|
 
 
 #
+# BUG#9775: crash if create function that returns enum or set
+#
+--disable_warnings
+drop function if exists bug9775|
+--enable_warnings
+create function bug9775(v1 char(1)) returns enum('a','b') return v1|
+select bug9775('a'),bug9775('b'),bug9775('c')|
+drop function bug9775|
+create function bug9775(v1 int) returns enum('a','b') return v1|
+select bug9775(1),bug9775(2),bug9775(3)|
+drop function bug9775|
+
+create function bug9775(v1 char(1)) returns set('a','b') return v1|
+select bug9775('a'),bug9775('b'),bug9775('a,b'),bug9775('c')|
+drop function bug9775|
+create function bug9775(v1 int) returns set('a','b') return v1|
+select bug9775(1),bug9775(2),bug9775(3),bug9775(4)|
+drop function bug9775|
+
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings