summaryrefslogtreecommitdiff
path: root/mysql-test/suite/jp
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-02-02 14:42:33 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-02-02 14:42:33 +0400
commit921a4e5eb533b30d6500dbc2d391684631277950 (patch)
tree11e166f49290ffcaa76282b2be22db5d57d3b8d4 /mysql-test/suite/jp
parentc205bef39d3762edad4345cf393fcf07007071d2 (diff)
downloadmariadb-git-921a4e5eb533b30d6500dbc2d391684631277950.tar.gz
fixed jp test failures
mysql-test/suite/jp/r/jp_create_db_sjis.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_ucs2.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_ujis.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_utf8.result: hide mtr database mysql-test/suite/jp/t/jp_create_db_sjis.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_ucs2.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_ujis.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_utf8.test: hide mtr database
Diffstat (limited to 'mysql-test/suite/jp')
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_sjis.result4
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_ucs2.result4
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_ujis.result4
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_utf8.result4
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_sjis.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_ucs2.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_ujis.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_utf8.test2
8 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result
index 2534e958931..fd66609b7bc 100644
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result
@@ -6,8 +6,8 @@ drop database if exists `ソ十表`;
CREATE DATABASE `ﾆﾎﾝｺﾞ`;
CREATE DATABASE `日本語`;
CREATE DATABASE `ソ十表`;
-SHOW DATABASES;
-Database
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+schema_name
information_schema
ソ十表
日本語
diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
index 4ba1b7b47b9..3a3316ecbaf 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
@@ -7,8 +7,8 @@ SET character_set_server = ucs2;
CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SHOW DATABASES;
-Database
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+schema_name
information_schema
ﾆﾋﾜｸ
常ﾜ常ﾝ常ﾞ
diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result
index b3beebbd917..4d6561b88ce 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result
@@ -6,8 +6,8 @@ SET character_set_database = ujis;
CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SHOW DATABASES;
-Database
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+schema_name
information_schema
ﾆﾋﾜｸ
常ﾜ常ﾝ常ﾞ
diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result
index 0e1725a9c86..2f70903ac71 100644
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result
@@ -6,8 +6,8 @@ SET character_set_database = utf8;
CREATE DATABASE `ｾｾ趣ｾ晢ｽｺｾ杼;
CREATE DATABASE `譌･譛ｬ隱杼;
CREATE DATABASE `鮴秘ｾ夜ｾ輿;
-SHOW DATABASES;
-Database
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+schema_name
information_schema
譌･譛ｬ隱
鮴秘ｾ夜ｾ
diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test
index 7d231eaf22c..49647bf1753 100644
--- a/mysql-test/suite/jp/t/jp_create_db_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test
@@ -16,7 +16,7 @@ CREATE DATABASE `ﾆﾎﾝｺﾞ`;
CREATE DATABASE `日本語`;
CREATE DATABASE `ソ十表`;
-SHOW DATABASES;
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
USE `ﾆﾎﾝｺﾞ`;
USE `日本語`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ucs2.test b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
index 9e8ca7d2a0f..8be8cf62f15 100644
--- a/mysql-test/suite/jp/t/jp_create_db_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
@@ -18,7 +18,7 @@ CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SHOW DATABASES;
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
USE `屡斜爵室酌`;
USE `ﾆﾋﾜｸ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ujis.test b/mysql-test/suite/jp/t/jp_create_db_ujis.test
index 0095f864836..382c7937552 100644
--- a/mysql-test/suite/jp/t/jp_create_db_ujis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ujis.test
@@ -17,7 +17,7 @@ CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SHOW DATABASES;
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
USE `屡斜爵室酌`;
USE `ﾆﾋﾜｸ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test
index f8faf411ed0..2df5b9e1f6f 100644
--- a/mysql-test/suite/jp/t/jp_create_db_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
@@ -16,7 +16,7 @@ CREATE DATABASE `ｾｾ趣ｾ晢ｽｺｾ杼;
CREATE DATABASE `譌･譛ｬ隱杼;
CREATE DATABASE `鮴秘ｾ夜ｾ輿;
-SHOW DATABASES;
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
USE `ｾｾ趣ｾ晢ｽｺｾ杼;
USE `譌･譛ｬ隱杼;
View Lorry Controller Status