diff options
| author | unknown <serg@serg.mylan> | 2004-02-17 16:57:39 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-17 16:57:39 +0100 |
| commit | a0040b0bdabae307e19fa5bd46fc13968db17135 (patch) | |
| tree | 10dd74bbc0033df4fdbb4f4c120fd51f31d5ad98 /sql/share/english | |
| parent | 66a266203fe162b2ebd78651032777d5c5f15f22 (diff) | |
| download | mariadb-git-a0040b0bdabae307e19fa5bd46fc13968db17135.tar.gz | |
if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it.
include/my_global.h:
do macro correctly
mysql-test/r/ctype_utf8.result:
updated
mysql-test/r/myisam.result:
updated
mysql-test/r/type_blob.result:
updated
mysql-test/t/ctype_utf8.test:
updated
mysql-test/t/type_blob.test:
new tests
sql/share/english/errmsg.txt:
specify that max key length is in BYTES
sql/share/russian/errmsg.txt:
specify that max key length is in BYTES
sql/share/ukrainian/errmsg.txt:
specify that max key length is in BYTES
sql/sql_table.cc:
if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it.
cleanup
Diffstat (limited to 'sql/share/english')
| -rw-r--r-- | sql/share/english/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 9632b4e1fd5..70cdf068587 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -72,9 +72,9 @@ character-set=latin1 "Not unique table/alias: '%-.64s'", "Invalid default value for '%-.64s'", "Multiple primary key defined", -"Too many keys specified. Max %d keys allowed", +"Too many keys specified; max %d keys allowed", "Too many key parts specified. Max %d parts allowed", -"Specified key was too long. Max key length is %d", +"Specified key was too long; max key length is %d bytes", "Key column '%-.64s' doesn't exist in table", "BLOB column '%-.64s' can't be used in key specification with the used table type", "Too big column length for column '%-.64s' (max = %d). Use BLOB instead", |