diff options
author | unknown <istruewing@stella.local> | 2008-01-15 12:51:51 +0100 |
---|---|---|
committer | unknown <istruewing@stella.local> | 2008-01-15 12:51:51 +0100 |
commit | 543cee3ea4119f9b00f38dd20adf2bad66e0f445 (patch) | |
tree | 68123483c78de9214bf60e7b6a71571d0be97b8c /mysql-test/r/myisam.result | |
parent | 99e49a34d4eab1d110645edeafbb04044a15812b (diff) | |
parent | 18a7ec307977df75160e071b57355404a09e8e96 (diff) | |
download | mariadb-git-543cee3ea4119f9b00f38dd20adf2bad66e0f445.tar.gz |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/t/myisam.test:
Auto merged
storage/myisam/mi_open.c:
Auto merged
mysql-test/r/myisam.result:
Manual merge from 5.0
Diffstat (limited to 'mysql-test/r/myisam.result')
-rw-r--r-- | mysql-test/r/myisam.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index a18018657e0..6863259aa9a 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1809,6 +1809,16 @@ CHECK TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 check status OK DROP TABLE t1; +CREATE TABLE t1 ( +c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL, +KEY(c1) +) ENGINE=MyISAM; +INSERT INTO t1 VALUES ('marshall\'s'); +INSERT INTO t1 VALUES ('marsh'); +CHECK TABLE t1 EXTENDED; +Table Op Msg_type Msg_text +test.t1 check status OK +DROP TABLE t1; CREATE TABLE t1 (id int NOT NULL, ref int NOT NULL, INDEX (id)) ENGINE=MyISAM; CREATE TABLE t2 LIKE t1; INSERT INTO t2 (id, ref) VALUES (1,3), (2,1), (3,2), (4,5), (4,4); |