diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-02 22:02:03 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-02 22:02:03 +0200 |
| commit | 301cdf9f240106978b04d4f8044b24e4a3fa6d00 (patch) | |
| tree | 0041cf05ee45a8b92584dd5d81ef8b4c5c1f9283 /mysql-test/r/isam.result | |
| parent | b47495360cbd21fa80efc72c18e9892ffeebd1ed (diff) | |
| parent | 62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744 (diff) | |
| download | mariadb-git-301cdf9f240106978b04d4f8044b24e4a3fa6d00.tar.gz | |
merge
Docs/manual.texi:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/isam.result')
| -rw-r--r-- | mysql-test/r/isam.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index baeda5537e5..d19352aad42 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -72,8 +72,8 @@ a int(11) PRI 0 select,insert,update,references b int(11) MUL 0 select,insert,update,references c int(11) 0 select,insert,update,references show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment -t1 0 PRIMARY 1 a A 4 NULL NULL -t1 1 b 1 b A 1 NULL NULL -t1 1 b 2 c A 4 NULL NULL +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment +t1 0 PRIMARY 1 a A 4 NULL NULL BTREE +t1 1 b 1 b A 1 NULL NULL BTREE +t1 1 b 2 c A 4 NULL NULL BTREE drop table t1,t2; |