Commit 47a70282 authored by unknown's avatar unknown
Browse files

BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329) 

This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.


sql/ha_myisammrg.cc:
  Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
  This fixes problems when merge table and subtables have different number of keys.
parent 9076d70e

sql/ha_myisammrg.cc

+14 −1
Original line number Diff line number Diff line
@@ -249,9 +249,22 @@ void ha_myisammrg::info(uint flag) 
  if (flag & HA_STATUS_CONST)

  {

    if (table->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->key_parts);

             sizeof(table->key_info[0].rec_per_key) *

             min(file->keys, table->key_parts));

    }

  }

}