diff options
author | unknown <guilhem@gbichot3.local> | 2006-09-07 11:23:01 +0200 |
---|---|---|
committer | unknown <guilhem@gbichot3.local> | 2006-09-07 11:23:01 +0200 |
commit | 5920b021b1dc3458480fb3b634dc4ba99a983d8a (patch) | |
tree | 743c2b5e98d550f5822d62a5574113f93e0fd5c8 /storage/myisammrg/ha_myisammrg.h | |
parent | bc3122a9f8c9fc384361210df0282883d5073a1f (diff) | |
parent | 4535e559db9290a4753a8fcd4af437d283aae18c (diff) | |
download | mariadb-git-5920b021b1dc3458480fb3b634dc4ba99a983d8a.tar.gz |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/my_pread.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_delete_all.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
configure.in:
merge
sql/mysqld.cc:
merge
storage/myisam/Makefile.am:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'storage/myisammrg/ha_myisammrg.h')
-rw-r--r-- | storage/myisammrg/ha_myisammrg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h index d58a3523c26..d4822b7706e 100644 --- a/storage/myisammrg/ha_myisammrg.h +++ b/storage/myisammrg/ha_myisammrg.h @@ -47,8 +47,8 @@ class ha_myisammrg: public handler HA_READ_ORDER | HA_KEYREAD_ONLY); } uint max_supported_keys() const { return MI_MAX_KEY; } - uint max_supported_key_length() const { return MI_MAX_KEY_LENGTH; } - uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; } + uint max_supported_key_length() const { return HA_MAX_KEY_LENGTH; } + uint max_supported_key_part_length() const { return HA_MAX_KEY_LENGTH; } double scan_time() { return ulonglong2double(stats.data_file_length) / IO_SIZE + file->tables; } |