List:Commits« Previous MessageNext Message »
From:Ingo Struewing Date:July 2 2008 3:18pm
Subject:bzr commit into mysql-6.0-backup branch (ingo.struewing:2647) WL#866
View as plain text  
#At file:///home2/mydev/bzrroot/mysql-6.0-backup/

 2647 Ingo Struewing	2008-07-02
      WL#866 - Online backup: MyISAM native driver
      Post-merge fix: Add initialization and destroyal for physical_logging_rwlock,
      which is used in mi_state_info_write().
modified:
  storage/myisam/mi_create.c

per-file messages:
  storage/myisam/mi_create.c
    WL#866 - Online backup: MyISAM native driver
    Post-merge fix: Add initialization and destroyal for physical_logging_rwlock,
    which is used in mi_state_info_write().
=== modified file 'storage/myisam/mi_create.c'
--- a/storage/myisam/mi_create.c	2008-07-01 20:32:27 +0000
+++ b/storage/myisam/mi_create.c	2008-07-02 15:18:34 +0000
@@ -571,6 +571,10 @@ int mi_create(const char *name,uint keys
     MI_EXTEND_BLOCK_LENGTH;
   if (! (flags & HA_DONT_TOUCH_DATA))
     share.state.create_time= (long) time((time_t*) 0);
+#ifdef THREAD
+  /* This rwlock is used in mi_state_info_write(). */
+  my_atomic_rwlock_init(&share.physical_logging_rwlock);
+#endif
 
   pthread_mutex_lock(&THR_LOCK_myisam);
 
@@ -838,6 +842,9 @@ int mi_create(const char *name,uint keys
   pthread_mutex_unlock(&THR_LOCK_myisam);
   if (my_close(file,MYF(0)))
     goto err;
+#ifdef THREAD
+  my_atomic_rwlock_destroy(&share.physical_logging_rwlock);
+#endif
   my_free((char*) rec_per_key_part,MYF(0));
   DBUG_RETURN(0);
 
@@ -862,6 +869,9 @@ err:
                                        MY_UNPACK_FILENAME | MY_APPEND_EXT),
 			     MYF(0));
   }
+#ifdef THREAD
+  my_atomic_rwlock_destroy(&share.physical_logging_rwlock);
+#endif
   my_free((char*) rec_per_key_part, MYF(0));
   DBUG_RETURN(my_errno=save_errno);		/* return the fatal errno */
 }

Thread
bzr commit into mysql-6.0-backup branch (ingo.struewing:2647) WL#866Ingo Struewing2 Jul