summaryrefslogtreecommitdiff
path: root/mysql-test/r/join.result
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-02-26 14:25:59 +0100
committermsvensson@pilot.blaudden <>2007-02-26 14:25:59 +0100
commitf6e31a2cd13ba2372736462a99f450ab5354d4c7 (patch)
tree51cdb10a0d9eb61b6b3036f2ec898e83f357c172 /mysql-test/r/join.result
parent0af1b1956852dbd5297f5ef63202d3175f5d11a0 (diff)
parentc550a455227c9390b7e0ad1f9f34807cda2671ab (diff)
downloadmariadb-git-f6e31a2cd13ba2372736462a99f450ab5354d4c7.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
Diffstat (limited to 'mysql-test/r/join.result')
-rw-r--r--mysql-test/r/join.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index fbddc6ffeab..0a45aa2eb9b 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -701,7 +701,7 @@ select * from information_schema.statistics join information_schema.columns
using(table_name,column_name) where table_name='user';
TABLE_NAME COLUMN_NAME TABLE_CATALOG TABLE_SCHEMA NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
user Host NULL mysql 0 mysql PRIMARY 1 A NULL NULL NULL BTREE NULL mysql 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI #
-user User NULL mysql 0 mysql PRIMARY 2 A 5 NULL NULL BTREE NULL mysql 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI #
+user User NULL mysql 0 mysql PRIMARY 2 A 3 NULL NULL BTREE NULL mysql 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI #
drop table t1;
drop table t2;
drop table t3;