diff options
| author | Chad MILLER <chad@mysql.com> | 2008-10-06 08:24:14 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-10-06 08:24:14 -0400 |
| commit | 494d2a2357f13f2f05668843e6c9f295e00f373f (patch) | |
| tree | 17f9ad9c9e3a7d2f6e7536d866bd215bc7c6e47a /mysql-test/t | |
| parent | 7c0b007e64c4e7325cfba9e94a20c9e15ab454a4 (diff) | |
| parent | 468cacec4fd850baafa287a00bf9d68914ab59d1 (diff) | |
| download | mariadb-git-494d2a2357f13f2f05668843e6c9f295e00f373f.tar.gz | |
Merge fix for join-testcase failure.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/join.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test index 55048a86f14..6c4de33950e 100644 --- a/mysql-test/t/join.test +++ b/mysql-test/t/join.test @@ -547,9 +547,9 @@ select * from v1a join v1b on t1.b = t2.b; # Bug #17523 natural join and information_schema # # Omit columns.PRIVILIGES as it may vary with embedded server. -# Omit columns.ORDINAL_POSITION as it may vary with hostname='localhost'. +# Omit columns.ORDINAL_POSITION and statistics.CARDINALITY as it may vary with hostname='localhost'. select - statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statistics.TABLE_SCHEMA, statistics.NON_UNIQUE, statistics.INDEX_SCHEMA, statistics.INDEX_NAME, statistics.SEQ_IN_INDEX, statistics.COLLATION, statistics.CARDINALITY, statistics.SUB_PART, statistics.PACKED, statistics.NULLABLE, statistics.INDEX_TYPE, statistics.COMMENT, + statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statistics.TABLE_SCHEMA, statistics.NON_UNIQUE, statistics.INDEX_SCHEMA, statistics.INDEX_NAME, statistics.SEQ_IN_INDEX, statistics.COLLATION, statistics.SUB_PART, statistics.PACKED, statistics.NULLABLE, statistics.INDEX_TYPE, statistics.COMMENT, columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_NULLABLE, columns.DATA_TYPE, columns.CHARACTER_MAXIMUM_LENGTH, columns.CHARACTER_OCTET_LENGTH, columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE, columns.CHARACTER_SET_NAME, columns.COLLATION_NAME, columns.COLUMN_TYPE, columns.COLUMN_KEY, columns.EXTRA, columns.COLUMN_COMMENT from information_schema.statistics join information_schema.columns using(table_name,column_name) where table_name='user'; |