diff options
author | unknown <svoj@april.(none)> | 2006-10-08 22:35:27 +0500 |
---|---|---|
committer | unknown <svoj@april.(none)> | 2006-10-08 22:35:27 +0500 |
commit | a7f8da2904525096fd6cf9c7999ce087ee4d9d4d (patch) | |
tree | 81baafd043ab003aba0bc29f60812d0f469e0b7b | |
parent | b5ae1184d7c2e5adb404579dd7fd5d0479ef9897 (diff) | |
parent | 9397becc6d9c5af98ba1fd89a699b389d83a91c3 (diff) | |
download | mariadb-git-a7f8da2904525096fd6cf9c7999ce087ee4d9d4d.tar.gz |
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
storage/myisammrg/ha_myisammrg.cc:
Auto merged
-rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 21a0e265a64..5c8a05f0dde 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -321,7 +321,7 @@ void ha_myisammrg::info(uint flag) with such a number, it'll be an error later anyway. */ bzero((char*) table->key_info[0].rec_per_key, - sizeof(table->key_info[0].rec_per_key) * table->key_parts); + sizeof(table->key_info[0].rec_per_key) * table->s->key_parts); #endif memcpy((char*) table->key_info[0].rec_per_key, (char*) info.rec_per_key, |