5.0-bugteam->5.1-bugteam merge
This commit is contained in:
commit
a6ccad60b4
@ -779,7 +779,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
|
||||
strpos=disk_buff+6;
|
||||
|
||||
if (!(rec_per_key= (ulong*) alloc_root(&share->mem_root,
|
||||
sizeof(ulong*)*key_parts)))
|
||||
sizeof(ulong)*key_parts)))
|
||||
goto err;
|
||||
|
||||
for (i=0 ; i < keys ; i++, keyinfo++)
|
||||
|
@ -1807,7 +1807,7 @@ int ha_myisam::info(uint flag)
|
||||
if (share->key_parts)
|
||||
memcpy((char*) table->key_info[0].rec_per_key,
|
||||
(char*) misam_info.rec_per_key,
|
||||
sizeof(table->key_info[0].rec_per_key[0])*share->key_parts);
|
||||
sizeof(table->key_info[0].rec_per_key[0])*share->key_parts);
|
||||
if (share->tmp_table == NO_TMP_TABLE)
|
||||
pthread_mutex_unlock(&share->mutex);
|
||||
|
||||
|
@ -925,11 +925,11 @@ int 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->s->key_parts);
|
||||
sizeof(table->key_info[0].rec_per_key[0]) * table->s->key_parts);
|
||||
#endif
|
||||
memcpy((char*) table->key_info[0].rec_per_key,
|
||||
(char*) mrg_info.rec_per_key,
|
||||
sizeof(table->key_info[0].rec_per_key) *
|
||||
sizeof(table->key_info[0].rec_per_key[0]) *
|
||||
min(file->keys, table->s->key_parts));
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user