Merge lp:~laurynas-biveinis/percona-server/bug1407941-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Merge bug 1407941 fix from 5.5. The 5.6 version of the fix is to shift
the purge worker thread ids towards the threads_id array end. Bump
srv_max_n_threads for the log tracker thread.

http://jenkins.percona.com/job/percona-server-5.6-param/791/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'storage/innobase/srv/srv0start.cc'
--- storage/innobase/srv/srv0start.cc	2015-01-05 17:23:09 +0000
+++ storage/innobase/srv/srv0start.cc	2015-01-07 07:56:43 +0000
@@ -128,9 +128,19 @@
 static os_file_t	files[1000];
 
 /** io_handler_thread parameters for thread identification */
-static ulint		n[SRV_MAX_N_IO_THREADS + 6];
-/** io_handler_thread identifiers, 32 is the maximum number of purge threads  */
-static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 6
+static ulint		n[SRV_MAX_N_IO_THREADS];
+/** io_handler_thread identifiers, 32 is the maximum number of purge threads.
+The extra elements at the end are allocated as follows:
+SRV_MAX_N_IO_THREADS + 1: srv_master_thread
+SRV_MAX_N_IO_THREADS + 2: lock_wait_timeout_thread
+SRV_MAX_N_IO_THREADS + 3: srv_error_monitor_thread
+SRV_MAX_N_IO_THREADS + 4: srv_monitor_thread
+SRV_MAX_N_IO_THREADS + 5: srv_redo_log_follow_thread
+SRV_MAX_N_IO_THREADS + 6: srv_purge_coordinator_thread
+SRV_MAX_N_IO_THREADS + 7: srv_worker_thread
+...
+SRV_MAX_N_IO_THREADS + 7 + srv_n_purge_threads - 1: srv_worker_thread */
+static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 7
 				   + SRV_MAX_N_PURGE_THREADS];
 
 /** We use this mutex to test the return value of pthread_mutex_trylock
@@ -1842,6 +1852,7 @@
 			    + 1 /* srv_error_monitor_thread */
 			    + 1 /* srv_monitor_thread */
 			    + 1 /* srv_master_thread */
+			    + 1 /* srv_redo_log_follow_thread */
 			    + 1 /* srv_purge_coordinator_thread */
 			    + 1 /* buf_dump_thread */
 			    + 1 /* dict_stats_thread */
@@ -2729,16 +2740,16 @@
 
 		os_thread_create(
 			srv_purge_coordinator_thread,
-			NULL, thread_ids + 5 + SRV_MAX_N_IO_THREADS);
+			NULL, thread_ids + 6 + SRV_MAX_N_IO_THREADS);
 
 		ut_a(UT_ARR_SIZE(thread_ids)
-		     > 5 + srv_n_purge_threads + SRV_MAX_N_IO_THREADS);
+		     > 6 + srv_n_purge_threads + SRV_MAX_N_IO_THREADS);
 
 		/* We've already created the purge coordinator thread above. */
 		for (i = 1; i < srv_n_purge_threads; ++i) {
 			os_thread_create(
 				srv_worker_thread, NULL,
-				thread_ids + 5 + i + SRV_MAX_N_IO_THREADS);
+				thread_ids + 6 + i + SRV_MAX_N_IO_THREADS);
 		}
 
 		srv_start_wait_for_purge_to_start();