Merge pull request #777 from laurynas-biveinis/bug1609422-5.6

Bug1609422 5.6

unittest/gunit/mysys_lf-t.cc

@@ -48,7 +48,11 @@ pthread_handler_t test_lf_pinbox(void *arg)
   int m= *(int *)arg;
   LF_PINS *pins;
 
-  if (with_my_thread_init)
+  // Save a local copy of with_my_thread_init to avoid a race with the main
+  // thread changing it
+  int do_my_thread_init= with_my_thread_init;
+
+  if (do_my_thread_init)
     my_thread_init();
 
   pins= lf_pinbox_get_pins(&lf_allocator.pinbox);
@@ -63,7 +67,7 @@ pthread_handler_t test_lf_pinbox(void *arg)
   if (!--running_threads) mysql_cond_signal(&cond);
   mysql_mutex_unlock(&mutex);
 
-  if (with_my_thread_init)
+  if (do_my_thread_init)
     my_thread_end();
 
   return 0;
@@ -84,7 +88,11 @@ pthread_handler_t test_lf_alloc(void *arg)
   int32 x,y= 0;
   LF_PINS *pins;
 
-  if (with_my_thread_init)
+  // Save a local copy of with_my_thread_init to avoid a race with the main
+  // thread changing it
+  int do_my_thread_init= with_my_thread_init;
+
+  if (do_my_thread_init)
     my_thread_init();
 
   pins= lf_alloc_get_pins(&lf_allocator);
@@ -117,7 +125,7 @@ pthread_handler_t test_lf_alloc(void *arg)
   if (!--running_threads) mysql_cond_signal(&cond);
   mysql_mutex_unlock(&mutex);
 
-  if (with_my_thread_init)
+  if (do_my_thread_init)
     my_thread_end();
   return 0;
 }
@@ -129,7 +137,11 @@ pthread_handler_t test_lf_hash(void *arg)
   int32 x,y,z,sum= 0, ins= 0;
   LF_PINS *pins;
 
-  if (with_my_thread_init)
+  // Save a local copy of with_my_thread_init to avoid a race with the main
+  // thread changing it
+  int do_my_thread_init= with_my_thread_init;
+
+  if (do_my_thread_init)
     my_thread_init();
 
   pins= lf_hash_get_pins(&lf_hash);
@@ -167,7 +179,8 @@ pthread_handler_t test_lf_hash(void *arg)
   }
   if (!--running_threads) mysql_cond_signal(&cond);
   mysql_mutex_unlock(&mutex);
-  if (with_my_thread_init)
+
+  if (do_my_thread_init)
     my_thread_end();
   return 0;
 }