Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
This commit is contained in:
svoj@april.(none) 2006-10-08 22:35:27 +05:00
commit cab855cac1

View File

@ -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,