diff options
| author | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
| commit | 017efd2124a70d0cad3b100e72eb975d46aa9ad1 (patch) | |
| tree | 6ebf0969524ee8c2567a33c286ae057b66a556ae /mysql-test/r/myisam.result | |
| parent | 18d1234ada5b66836e8f5f2f4d49e85b9cc87e09 (diff) | |
| parent | a0040b0bdabae307e19fa5bd46fc13968db17135 (diff) | |
| download | mariadb-git-017efd2124a70d0cad3b100e72eb975d46aa9ad1.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'mysql-test/r/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 278b9f41480..1f3e12a33aa 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -323,10 +323,10 @@ Table Op Msg_type Msg_text test.t1 check status OK drop table t1; CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), KEY t1 (a, b, c)); -ERROR 42000: Specified key was too long. Max key length is 500 +ERROR 42000: Specified key was too long; max key length is 500 bytes CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255)); ALTER TABLE t1 ADD INDEX t1 (a, b, c); -ERROR 42000: Specified key was too long. Max key length is 500 +ERROR 42000: Specified key was too long; max key length is 500 bytes DROP TABLE t1; CREATE TABLE t1 (a int not null, b int, c int, key(b), key(c), key(a,b), key(c,a)); INSERT into t1 values (0, null, 0), (0, null, 1), (0, null, 2), (0, null,3), (1,1,4); |