Commit a7f8da29 authored by unknown's avatar unknown
Browse files

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
parents b5ae1184 9397becc

storage/myisammrg/ha_myisammrg.cc

+1 −1
Original line number Diff line number Diff line
@@ -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,