MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Marc Alff Date:October 29 2009 3:21pm
Subject:bzr push into mysql-5.5-next-mr-bugfixing branch (marc.alff:2930 to 2931)
Bug#38968
View as plain text  
 2931 Marc Alff	2009-10-29
      Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_received
      
      Backport for 5.5

    modified:
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/net_serv.cc
 2930 Marc Alff	2009-10-29 [merge]
      Local merge

    modified:
      client/mysql_upgrade.c
      mysql-test/r/mysql_upgrade.result
      mysql-test/t/mysql_upgrade.test
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-10-29 15:07:29 +0000
+++ b/sql/mysql_priv.h	2009-10-29 15:21:16 +0000
@@ -1969,8 +1969,7 @@ extern pthread_mutex_t LOCK_mysql_create
        LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,
        LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_read_lock,
        LOCK_global_system_variables, LOCK_user_conn,
-       LOCK_prepared_stmt_count, LOCK_error_messages,
-       LOCK_bytes_sent, LOCK_bytes_received, LOCK_connection_count;
+       LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count;
 extern MYSQL_PLUGIN_IMPORT pthread_mutex_t LOCK_thread_count;
 #ifdef HAVE_OPENSSL
 extern pthread_mutex_t LOCK_des_key_file;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-10-29 15:07:29 +0000
+++ b/sql/mysqld.cc	2009-10-29 15:21:16 +0000
@@ -657,7 +657,7 @@ pthread_mutex_t LOCK_mysql_create_db, LO
 		LOCK_mapped_file, LOCK_status, LOCK_global_read_lock,
 		LOCK_error_log, LOCK_uuid_generator,
 		LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
-		LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received,
+		LOCK_crypt,
 	        LOCK_global_system_variables,
 		LOCK_user_conn, LOCK_slave_list, LOCK_active_mi,
                 LOCK_connection_count, LOCK_error_messages;
@@ -1433,8 +1433,6 @@ static void clean_up_mutexes()
   (void) pthread_mutex_destroy(&LOCK_delayed_create);
   (void) pthread_mutex_destroy(&LOCK_manager);
   (void) pthread_mutex_destroy(&LOCK_crypt);
-  (void) pthread_mutex_destroy(&LOCK_bytes_sent);
-  (void) pthread_mutex_destroy(&LOCK_bytes_received);
   (void) pthread_mutex_destroy(&LOCK_user_conn);
   (void) pthread_mutex_destroy(&LOCK_connection_count);
   Events::destroy_mutexes();
@@ -3579,8 +3577,6 @@ static int init_thread_environment()
   (void) pthread_mutex_init(&LOCK_delayed_create,MY_MUTEX_INIT_SLOW);
   (void) pthread_mutex_init(&LOCK_manager,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_crypt,MY_MUTEX_INIT_FAST);
-  (void) pthread_mutex_init(&LOCK_bytes_sent,MY_MUTEX_INIT_FAST);
-  (void) pthread_mutex_init(&LOCK_bytes_received,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_user_conn, MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_active_mi, MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST);

=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2009-08-12 13:44:34 +0000
+++ b/sql/net_serv.cc	2009-10-29 15:21:16 +0000
@@ -91,7 +91,6 @@ void sql_print_error(const char *format,
 */
 extern uint test_flags;
 extern ulong bytes_sent, bytes_received, net_big_packet_count;
-extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
 #ifndef MYSQL_INSTANCE_MANAGER
 #ifdef HAVE_QUERY_CACHE
 #define USE_QUERY_CACHE


Attachment: [text/bzr-bundle] bzr/marc.alff@sun.com-20091029152116-an38k2t3h5mfh1lg.bundle
Thread
bzr push into mysql-5.5-next-mr-bugfixing branch (marc.alff:2930 to 2931)Bug#38968Marc Alff29 Oct