1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines


storage/myisammrg/ha_myisammrg.cc:
  Auto merged
This commit is contained in:
unknown 2006-10-06 15:31:11 +05:00
commit 4d7a6cf766
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/myisammrg/ha_myisammrg.cc
View File

@ -312,9 +312,22 @@ void ha_myisammrg::info(uint flag)
if (flag & HA_STATUS_CONST) if (flag & HA_STATUS_CONST)
{ {
if (table->s->key_parts && info.rec_per_key) if (table->s->key_parts && info.rec_per_key)
{
#ifdef HAVE_purify
/*
valgrind may be unhappy about it, because optimizer may access values
between file->keys and table->key_parts, that will be uninitialized.
It's safe though, because even if opimizer will decide to use a key
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);
#endif
memcpy((char*) table->key_info[0].rec_per_key, memcpy((char*) table->key_info[0].rec_per_key,
(char*) info.rec_per_key, (char*) info.rec_per_key,
sizeof(table->key_info[0].rec_per_key)*table->s->key_parts); sizeof(table->key_info[0].rec_per_key) *
min(file->keys, table->s->key_parts));
}
} }
} }