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

Fix buildbot failures caused by two previous pushes.

Browse Source
This commit is contained in:
Sergey Petrunya 2010-11-08 23:25:12 +02:00
parent 476e90fc97
commit ea13c77652
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/myisam/mi_open.c
View File

@ -85,13 +85,12 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
uchar *disk_cache, *disk_pos, *end_pos; uchar *disk_cache, *disk_pos, *end_pos;
MI_INFO info,*m_info,*old_info; MI_INFO info,*m_info,*old_info;
MYISAM_SHARE share_buff,*share; MYISAM_SHARE share_buff,*share;
ulong *rec_per_key_part; ulong *rec_per_key_part= 0;
my_off_t *key_root, *key_del; my_off_t *key_root, *key_del;
ulonglong max_key_file_length, max_data_file_length; ulonglong max_key_file_length, max_data_file_length;
DBUG_ENTER("mi_open"); DBUG_ENTER("mi_open");
LINT_INIT(m_info); LINT_INIT(m_info);
LINT_INIT(rec_per_key_part);
kfile= -1; kfile= -1;
lock_error=1; lock_error=1;
errpos=0; errpos=0;
@ -683,6 +682,7 @@ err:
if ((save_errno == HA_ERR_CRASHED) || if ((save_errno == HA_ERR_CRASHED) ||
(save_errno == HA_ERR_CRASHED_ON_USAGE) || (save_errno == HA_ERR_CRASHED_ON_USAGE) ||
(save_errno == HA_ERR_CRASHED_ON_REPAIR)) (save_errno == HA_ERR_CRASHED_ON_REPAIR))
rec_per_key_part= 0;
mi_report_error(save_errno, name); mi_report_error(save_errno, name);
switch (errpos) { switch (errpos) {
case 6: case 6:
@ -699,7 +699,6 @@ err:
case 3: case 3:
if (! lock_error) if (! lock_error)
VOID(my_lock(kfile, F_UNLCK, 0L, F_TO_EOF, MYF(MY_SEEK_NOT_DONE))); VOID(my_lock(kfile, F_UNLCK, 0L, F_TO_EOF, MYF(MY_SEEK_NOT_DONE)));
if (rec_per_key_part)
my_free(rec_per_key_part, MYF(MY_ALLOW_ZERO_PTR)); my_free(rec_per_key_part, MYF(MY_ALLOW_ZERO_PTR));
/* fall through */ /* fall through */
case 2: case 2: