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

5.0-bugteam->5.1-bugteam merge

Browse Source
This commit is contained in:
Sergey Glukhov 2009-05-27 15:42:19 +05:00
commit a6ccad60b4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/table.cc
View File

@ -779,7 +779,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
strpos=disk_buff+6; strpos=disk_buff+6;
if (!(rec_per_key= (ulong*) alloc_root(&share->mem_root, if (!(rec_per_key= (ulong*) alloc_root(&share->mem_root,
sizeof(ulong*)*key_parts))) sizeof(ulong)*key_parts)))
goto err; goto err;
for (i=0 ; i < keys ; i++, keyinfo++) for (i=0 ; i < keys ; i++, keyinfo++)

4
storage/myisammrg/ha_myisammrg.cc
View File

@ -925,11 +925,11 @@ int ha_myisammrg::info(uint flag)
with such a number, it'll be an error later anyway. with such a number, it'll be an error later anyway.
*/ */
bzero((char*) table->key_info[0].rec_per_key, 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 #endif
memcpy((char*) table->key_info[0].rec_per_key, memcpy((char*) table->key_info[0].rec_per_key,
(char*) mrg_info.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)); min(file->keys, table->s->key_parts));
} }
} }