List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 31 2009 12:47pm
Subject:bzr push into mysql-pe branch (davi:3494 to 3495)
View as plain text  
 3495 Davi Arnaut	2009-07-31 [merge]
      Manual merge.

    modified:
      sql/mysqld.cc
 3494 Kristofer Pettersson	2009-07-31 [merge]
      Automerge

    modified:
      client/mysql.cc
      include/myisammrg.h
      mysql-test/r/merge.result
      mysql-test/r/mysql.result
      mysql-test/t/merge.test
      mysql-test/t/mysql.test
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/myisammrg/myrg_info.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-07-30 19:15:44 +0000
+++ b/sql/mysqld.cc	2009-07-31 12:44:50 +0000
@@ -3734,7 +3734,7 @@ static int init_thread_environment()
 {
   (void) pthread_mutex_init(&LOCK_mysql_create_db,MY_MUTEX_INIT_SLOW);
   (void) pthread_mutex_init(&LOCK_lock_db,MY_MUTEX_INIT_SLOW);
-  (void) pthread_mutex_init(&LOCK_open, NULL);
+  (void) pthread_mutex_init(&LOCK_open, MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_mapped_file,MY_MUTEX_INIT_SLOW);
   (void) pthread_mutex_init(&LOCK_status,MY_MUTEX_INIT_FAST);


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20090731124450-4dq2edbwnev11mzs.bundle
Thread
bzr push into mysql-pe branch (davi:3494 to 3495)Davi Arnaut31 Jul