diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-12 12:21:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-12 12:21:51 +0200 |
| commit | 6288ebb699563c86fbc26660f961fa0e381ae871 (patch) | |
| tree | 22118eeb643bce89493c98e11ef020fc49668cbe /sql/ha_myisammrg.cc | |
| parent | 6e37987c512b4fb3b11f347b050eeabf30bfae04 (diff) | |
| parent | 4c221321b624e55238c641b515e24ad1091cdc93 (diff) | |
| download | mariadb-git-6288ebb699563c86fbc26660f961fa0e381ae871.tar.gz | |
merge
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
client/mysqlimport.c:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 63a23fb708f..42f8b807898 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -189,7 +189,7 @@ void ha_myisammrg::info(uint flag) deleted = (ha_rows) info.deleted; data_file_length=info.data_file_length; errkey = info.errkey; - table->keys_in_use=(((key_map) 1) << table->keys)- (key_map) 1; + table->keys_in_use= set_bits(key_map, table->keys); table->db_options_in_use = info.options; table->is_view=1; mean_rec_length=info.reclength; |