mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge from 5.0 for 43414
This commit is contained in:
commit
5be4c38226
45 changed files with 119 additions and 156 deletions
|
|
@ -37,7 +37,7 @@
|
|||
MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
|
||||
{
|
||||
int save_errno,errpos=0;
|
||||
uint files= 0, i, dir_length, length, key_parts, min_keys= 0;
|
||||
uint files= 0, i, dir_length, length, UNINIT_VAR(key_parts), min_keys= 0;
|
||||
ulonglong file_offset=0;
|
||||
char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end;
|
||||
MYRG_INFO *m_info=0;
|
||||
|
|
@ -49,8 +49,6 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
|
|||
my_bool bad_children= FALSE;
|
||||
DBUG_ENTER("myrg_open");
|
||||
|
||||
LINT_INIT(key_parts);
|
||||
|
||||
bzero((char*) &file,sizeof(file));
|
||||
if ((fd=my_open(fn_format(name_buff,name,"",MYRG_NAME_EXT,
|
||||
MY_UNPACK_FILENAME|MY_APPEND_EXT),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue