summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-01-21 17:50:58 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2005-01-21 17:50:58 +0100
commit5b5f5071ea6823292f0a52c3046713ef01a0bfe5 (patch)
treea84e898205be267ec5d38ff7dd08f017e485720d /mysql-test
parent11a37f47759fb901be3655901c24c7af0edbd3fd (diff)
parent90f94790986ba8c3938b575d8e5592a7a06471db (diff)
downloadmariadb-git-5b5f5071ea6823292f0a52c3046713ef01a0bfe5.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ctype_mb.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_mb.result b/mysql-test/r/ctype_mb.result
index 88941d11aad..f6e14e1a78f 100644
--- a/mysql-test/r/ctype_mb.result
+++ b/mysql-test/r/ctype_mb.result
@@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW KEYS FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
-t1 1 key_a 1 a A NULL 9 NULL YES BTREE
+t1 1 key_a 1 a A NULL 3 NULL YES BTREE
ALTER TABLE t1 CHANGE a a CHAR(4);
SHOW CREATE TABLE t1;
Table Create Table
@@ -53,5 +53,5 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW KEYS FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
-t1 1 key_a 1 a A NULL 9 NULL YES BTREE
+t1 1 key_a 1 a A NULL 3 NULL YES BTREE
DROP TABLE t1;