Commit 4d7a6cf7 authored by unknown's avatar unknown
Browse files

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

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


storage/myisammrg/ha_myisammrg.cc:
  Auto merged
parents 98209543 12fb87ac
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -312,9 +312,22 @@ void ha_myisammrg::info(uint flag)
  if (flag & HA_STATUS_CONST)
  {
    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,
	     (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));
    }
  }
}