Merge of fix 18351022, cset 7640 from trunk

Author: bjornmu

storage/innobase/include/srv0conc.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -52,17 +52,20 @@ we could get a deadlock. Value of 0 will disable the concurrency check. */
 
 extern ulong	srv_thread_concurrency;
 
-/*********************************************************************//**
-Initialise the concurrency management data structures */
+#ifndef HAVE_ATOMIC_BUILTINS
+/** Mutex protecting some server global variables. */
+extern ib_mutex_t	server_mutex;
+
+/** Initialise the concurrency management data structures. */
+
 void
 srv_conc_init(void);
-/*===============*/
 
-/*********************************************************************//**
-Free the concurrency management data structures */
+/** Free the concurrency management data structures. */
+
 void
 srv_conc_free(void);
-/*===============*/
+#endif /* !HAVE_ATOMIC_BUILTINS */
 
 /*********************************************************************//**
 Puts an OS thread to wait if there are too many concurrent threads

storage/innobase/include/srv0srv.h

@@ -376,11 +376,6 @@ extern ulint	srv_fatal_semaphore_wait_threshold;
 #define SRV_SEMAPHORE_WAIT_EXTENSION	7200
 extern ulint	srv_dml_needed_delay;
 
-#ifndef HAVE_ATOMIC_BUILTINS
-/** Mutex protecting some server global variables. */
-extern ib_mutex_t	server_mutex;
-#endif /* !HAVE_ATOMIC_BUILTINS */
-
 #define SRV_MAX_N_IO_THREADS	130
 
 /* Array of English strings describing the current state of an

storage/innobase/srv/srv0conc.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -69,6 +69,8 @@ we could get a deadlock. Value of 0 will disable the concurrency check. */
 ulong	srv_thread_concurrency	= 0;
 
 #ifndef HAVE_ATOMIC_BUILTINS
+/** Mutex protecting some server global variables. */
+ib_mutex_t	server_mutex;
 
 /** This mutex protects srv_conc data structures */
 static SysMutex	srv_conc_mutex;
@@ -118,13 +120,12 @@ struct srv_conc_t {
 /* Control variables for tracking concurrency. */
 static srv_conc_t	srv_conc;
 
-/*********************************************************************//**
-Initialise the concurrency management data structures */
+#ifndef HAVE_ATOMIC_BUILTINS
+/** Initialise the concurrency management data structures. */
+
 void
 srv_conc_init(void)
-/*===============*/
 {
-#ifndef HAVE_ATOMIC_BUILTINS
 	ulint		i;
 
 	/* Init the server concurrency restriction data structures */
@@ -142,21 +143,21 @@ srv_conc_init(void)
 		conc_slot->event = os_event_create("conc_event");
 		ut_a(conc_slot->event);
 	}
-#endif /* !HAVE_ATOMIC_BUILTINS */
+
+	mutex_create("server", &server_mutex);
 }
 
-/*********************************************************************//**
-Free the concurrency management data structures */
+/** Free the concurrency management data structures. */
+
 void
 srv_conc_free(void)
-/*===============*/
 {
-#ifndef HAVE_ATOMIC_BUILTINS
+	mutex_free(&server_mutex);
 	mutex_free(&srv_conc_mutex);
 	ut_free(srv_conc_slots);
 	srv_conc_slots = NULL;
-#endif /* !HAVE_ATOMIC_BUILTINS */
 }
+#endif /* !HAVE_ATOMIC_BUILTINS */
 
 #ifdef HAVE_ATOMIC_BUILTINS
 /*********************************************************************//**

storage/innobase/srv/srv0srv.cc

@@ -502,11 +502,6 @@ struct srv_sys_t{
 						activity */
 };
 
-#ifndef HAVE_ATOMIC_BUILTINS
-/** Mutex protecting some server global variables. */
-ib_mutex_t	server_mutex;
-#endif /* !HAVE_ATOMIC_BUILTINS */
-
 static srv_sys_t*	srv_sys	= NULL;
 
 /** Event to signal the monitor thread. */
@@ -840,10 +835,6 @@ srv_init(void)
 	ulint	n_sys_threads = 0;
 	ulint	srv_sys_sz = sizeof(*srv_sys);
 
-#ifndef HAVE_ATOMIC_BUILTINS
-	mutex_create("server", &server_mutex);
-#endif /* !HAVE_ATOMIC_BUILTINS */
-
 	mutex_create("srv_innodb_monitor", &srv_innodb_monitor_mutex);
 
 	if (!srv_read_only_mode) {
@@ -897,8 +888,9 @@ srv_init(void)
 	/* Create dummy indexes for infimum and supremum records */
 
 	dict_ind_init();
-
+#ifndef HAVE_ATOMIC_BUILTINS
 	srv_conc_init();
+#endif /* !HAVE_ATOMIC_BUILTINS */
 
 	/* Initialize some INFORMATION SCHEMA internal structures */
 	trx_i_s_cache_init(trx_i_s_cache);
@@ -913,12 +905,6 @@ void
 srv_free(void)
 /*==========*/
 {
-	srv_conc_free();
-
-#ifndef HAVE_ATOMIC_BUILTINS
-	mutex_free(&server_mutex);
-#endif /* !HAVE_ATOMIC_BUILTINS */
-
 	mutex_free(&srv_innodb_monitor_mutex);
 	mutex_free(&page_zip_stat_per_index_mutex);
 

storage/innobase/srv/srv0start.cc

@@ -2542,6 +2542,9 @@ innobase_shutdown_for_mysql(void)
 	pars_lexer_close();
 	log_mem_free();
 	buf_pool_free(srv_buf_pool_instances);
+#ifndef HAVE_ATOMIC_BUILTINS
+	srv_conc_free();
+#endif /* !HAVE_ATOMIC_BUILTINS */
 
 	/* 6. Free the thread management resoruces. */
 	os_thread_free();