diff options
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 8f756a4c303..5e316fe1d76 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -4990,22 +4990,22 @@ SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f1"| dtd_identifier -char(10) CHARSET utf8 +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f2"| dtd_identifier -char(10) CHARSET koi8r +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest2" AND ROUTINE_NAME = "bug16211_f3"| dtd_identifier -char(10) CHARSET utf8 +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest2" AND ROUTINE_NAME = "bug16211_f4"| dtd_identifier -char(10) CHARSET koi8r +char(10) SELECT CHARSET(bug16211_f1())| CHARSET(bug16211_f1()) utf8 @@ -5040,22 +5040,22 @@ SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f1"| dtd_identifier -char(10) CHARSET utf8 +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f2"| dtd_identifier -char(10) CHARSET koi8r +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest2" AND ROUTINE_NAME = "bug16211_f3"| dtd_identifier -char(10) CHARSET utf8 +char(10) SELECT dtd_identifier FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = "mysqltest2" AND ROUTINE_NAME = "bug16211_f4"| dtd_identifier -char(10) CHARSET koi8r +char(10) SELECT CHARSET(bug16211_f1())| CHARSET(bug16211_f1()) utf8 |