[Commits] Rev 2847: Fix buildbot failures caused by two previous pushes. in file:///home/psergey/dev2/5.3-look1/

Sergey Petrunya psergey at askmonty.org
Mon Nov 8 23:25:14 EET 2010


At file:///home/psergey/dev2/5.3-look1/

------------------------------------------------------------
revno: 2847
revision-id: psergey at askmonty.org-20101108212512-2holhmmn42eh03i3
parent: psergey at askmonty.org-20101108175131-2tu1y59beit3jlis
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 5.3-look1
timestamp: Mon 2010-11-08 23:25:12 +0200
message:
  Fix buildbot failures caused by two previous pushes.
=== modified file 'storage/myisam/mi_open.c'
--- a/storage/myisam/mi_open.c	2010-11-08 17:51:31 +0000
+++ b/storage/myisam/mi_open.c	2010-11-08 21:25:12 +0000
@@ -85,13 +85,12 @@
   uchar *disk_cache, *disk_pos, *end_pos;
   MI_INFO info,*m_info,*old_info;
   MYISAM_SHARE share_buff,*share;
-  ulong *rec_per_key_part;
+  ulong *rec_per_key_part= 0;
   my_off_t *key_root, *key_del;
   ulonglong max_key_file_length, max_data_file_length;
   DBUG_ENTER("mi_open");
 
   LINT_INIT(m_info);
-  LINT_INIT(rec_per_key_part);
   kfile= -1;
   lock_error=1;
   errpos=0;
@@ -683,6 +682,7 @@
   if ((save_errno == HA_ERR_CRASHED) ||
       (save_errno == HA_ERR_CRASHED_ON_USAGE) ||
       (save_errno == HA_ERR_CRASHED_ON_REPAIR))
+  rec_per_key_part= 0;
     mi_report_error(save_errno, name);
   switch (errpos) {
   case 6:
@@ -699,8 +699,7 @@
   case 3:
     if (! lock_error)
       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 */
   case 2:
     my_afree(disk_cache);



More information about the commits mailing list