diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-04-22 12:36:17 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-04-22 12:36:17 +0300 |
| commit | 69fc2af00748a078f9db362e233212018f939c46 (patch) | |
| tree | 70ef8a6e564241ac389748fb2a911ac7cd2f38fd | |
| parent | 298e1d3f71cce89c83645ea9cc1eade4bdaf4917 (diff) | |
| download | mariadb-git-bb-10.0-jplindst.tar.gz | |
MDEV-8487: mysql-test - main.information_schema 'xtradb' failsbb-10.0-jplindst
Added replace_column to avoid test failure when server built
with -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
| -rw-r--r-- | mysql-test/r/information_schema.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/information_schema.test | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 6980b5d30ed..bdfd5d71ab2 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -11,7 +11,7 @@ select * from information_schema.SCHEMATA where schema_name > 'm'; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL -def performance_schema utf8 utf8_general_ci NULL +def performance_schema latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL select schema_name from information_schema.schemata; schema_name diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index b2e18097c65..62b09ebd15f 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -30,7 +30,13 @@ grant select, update on test.* to mysqltest_1@localhost; create user mysqltest_3@localhost; create user mysqltest_3; - +# +# Added below replace to avoid +# MDEV-8487: mysql-test - main.information_schema 'xtradb' fails +# when server built with -DDEFAULT_CHARSET=utf8 +# -DDEFAULT_COLLATION=utf8_general_ci +# +--replace_column 3 latin1 4 latin1_swedish_ci select * from information_schema.SCHEMATA where schema_name > 'm'; select schema_name from information_schema.schemata; show databases like 't%'; |