merging

mysql-test/r/ps.result:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 26 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test
new file mode 100644
index 00000000000..4f8eb24cbe3
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
@@ -0,0 +1,26 @@
+--disable_warnings
+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `龔龖龗`;
+--enable_warnings
+
+#
+# Test Creating databases using Japanese charact for DB name in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `龔龖龗`;
+
+SHOW DATABASES;
+
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `龔龖龗`;
+
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `龔龖龗`;