summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp-ucs2.result
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2010-01-15 15:42:15 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2010-01-15 15:42:15 +0400
commit5a4a98af14fb92df95a6333cdfeaa76b17f6a3de (patch)
tree27e8d3afcdce37b4784bb89e2952a59cb19278d8 /mysql-test/r/sp-ucs2.result
parent50561ab0108dcb427ba0975f11dcab3e20b05612 (diff)
downloadmariadb-git-5a4a98af14fb92df95a6333cdfeaa76b17f6a3de.tar.gz
backported:
-WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns -WL#2003 INFORMATION_SCHEMA: PARAMETERS view -addon for 'I_S optimization' WL
Diffstat (limited to 'mysql-test/r/sp-ucs2.result')
-rw-r--r--mysql-test/r/sp-ucs2.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-ucs2.result b/mysql-test/r/sp-ucs2.result
index 5d4289a60c5..aa87e8865ed 100644
--- a/mysql-test/r/sp-ucs2.result
+++ b/mysql-test/r/sp-ucs2.result
@@ -132,7 +132,7 @@ RETURN 0 utf8 utf8_general_ci latin1_swedish_ci
SELECT DTD_IDENTIFIER FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_NAME='bug48766';
DTD_IDENTIFIER
-enum('w') CHARSET ucs2
+enum('w')
DROP FUNCTION bug48766;
CREATE FUNCTION bug48766 ()
RETURNS ENUM('а','б','в','г') CHARACTER SET ucs2
@@ -144,5 +144,5 @@ RETURN 0 utf8 utf8_general_ci latin1_swedish_ci
SELECT DTD_IDENTIFIER FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_NAME='bug48766';
DTD_IDENTIFIER
-enum('а','б','в','г') CHARSET ucs2
+enum('а','б','в','г')
DROP FUNCTION bug48766;