diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
| commit | 62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744 (patch) | |
| tree | 8dbf52f0dc71a962692f98d1363958acf5d8fd67 /sql/ha_innobase.h | |
| parent | f4fee3d90e8456cfd2a4e2f395bd270d0a12c70d (diff) | |
| parent | 38e174cc59f99e8bd55e98d2d427037a5a7719e6 (diff) | |
| download | mariadb-git-62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqldump.c:
Use local version in 4.0
configure.in:
Use 4.0 code
Diffstat (limited to 'sql/ha_innobase.h')
| -rw-r--r-- | sql/ha_innobase.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index bcd11b8a96e..3c3025c39c1 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -101,8 +101,11 @@ class ha_innobase: public handler a secondary key record must also contain the primary key value: max key length is therefore set to slightly - less than 1 / 4 of page size which is 16 kB */ - uint max_key_length() const { return 3500; } + less than 1 / 4 of page size which is 16 kB; + but currently MySQL does not work with keys + whose size is > MAX_KEY_LENGTH */ + uint max_key_length() const { return((MAX_KEY_LENGTH <= 3500) ? + MAX_KEY_LENGTH : 3500);} bool fast_key_read() { return 1;} key_map keys_to_use_for_scanning() { return ~(key_map) 0; } bool has_transactions() { return 1;} |