diff options
author | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
commit | b192ab5edc45bf221f99ed53ce4d975160d830fa (patch) | |
tree | 39df3a873ccd4aba6541c6659c5508843742f8be /sql/ha_innodb.h | |
parent | 9456073f90354e82c8b31335bac1d486c88f2f4a (diff) | |
parent | bbfa68d10202df2bf6bc8193d3355fb22f31cff7 (diff) | |
download | mariadb-git-b192ab5edc45bf221f99ed53ce4d975160d830fa.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
myisam/myisamdef.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r-- | sql/ha_innodb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 0c89a9d29ce..9ef47a105d6 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -125,7 +125,7 @@ class ha_innobase: public handler 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; } + const key_map& keys_to_use_for_scanning() { return key_map_full; } bool has_transactions() { return 1;} int open(const char *name, int mode, uint test_if_locked); |