Merge lp:~akopytov/percona-xtradb-cluster/bug1333348-5.5 into lp:percona-xtradb-cluster/5.5

[Alexey Kopytov]

[Raghavendra D Prabhu (raghavendra-prabhu)]

Commented for 5.6, needs some fixing.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Done.

=== removed symlink 'build'
=== target was u'build-ps'
=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2014-04-30 02:30:49 +0000
+++ sql/mysqld.cc	2014-06-26 18:26:28 +0000
@@ -4523,11 +4523,19 @@
 
   mysql_thread_set_psi_id(thd->thread_id);
   thd->thr_create_utime= my_micro_time();
-  if (MYSQL_CALLBACK_ELSE(thd->scheduler, init_new_connection_thread, (), 0))
+
+  /*
+     Don't use thd->scheduler methods to initialize and destroy wsrep threads,
+     as these threads are not managed by the scheduler specified with the
+     thread_handling option. Instead execute initialization/destruction code
+     directly similar to the replication slave threads.
+  */
+
+  if (init_new_connection_handler_thread())
   {
     close_connection(thd, ER_OUT_OF_RESOURCES);
     statistic_increment(aborted_connects,&LOCK_status);
-    MYSQL_CALLBACK(thd->scheduler, end_thread, (thd, 0));
+    one_thread_per_connection_end(thd, 0);
 
     return(NULL);
   }
@@ -4550,7 +4558,7 @@
   {
     close_connection(thd, ER_OUT_OF_RESOURCES);
     statistic_increment(aborted_connects,&LOCK_status);
-    MYSQL_CALLBACK(thd->scheduler, end_thread, (thd, 0));
+    one_thread_per_connection_end(thd, 0);
     delete thd;
 
     return(NULL);
@@ -4592,23 +4600,13 @@
   if (plugins_are_initialized)
   {
     net_end(&thd->net);
-    MYSQL_CALLBACK(thd->scheduler, end_thread, (thd, 1));
+    one_thread_per_connection_end(thd, 0);
   }
   else
   {
-    // TODO: lightweight cleanup to get rid of:
-    // 'Error in my_thread_global_end(): 2 threads didn't exit'
-    // at server shutdown
+    my_thread_end();
   }
 
-  if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
-  {
-    mysql_mutex_lock(&LOCK_thread_count);
-    delete thd;
-    thread_count--;
-    mysql_mutex_unlock(&LOCK_thread_count);
-  }
-  my_thread_end();
   return(NULL);
 }
 
@@ -4691,7 +4689,8 @@
 static void wsrep_close_thread(THD *thd)
 {
   thd->killed= THD::KILL_CONNECTION;
-  MYSQL_CALLBACK(thd->scheduler, post_kill_notification, (thd));
+  if (!thd->wsrep_applier)
+    MYSQL_CALLBACK(thd->scheduler, post_kill_notification, (thd));
   if (thd->mysys_var)
   {
     thd->mysys_var->abort=1;
@@ -4878,14 +4877,7 @@
   // This gotta be fixed in a more elegant manner if we gonna have arbitrary
   // number of non-applier wsrep threads.
   {
-    if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
-    {
-      mysql_mutex_unlock(&LOCK_thread_count);
-      my_sleep(100);
-      mysql_mutex_lock(&LOCK_thread_count);
-    }
-    else
-      mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
+    mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
     DBUG_PRINT("quit",("One applier died (count=%u)",thread_count));
   }
   mysql_mutex_unlock(&LOCK_thread_count);
@@ -4895,14 +4887,7 @@
   mysql_mutex_lock(&LOCK_thread_count);
   while (wsrep_running_threads > 0)
   {
-   if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
-    {
-      mysql_mutex_unlock(&LOCK_thread_count);
-      my_sleep(100);
-      mysql_mutex_lock(&LOCK_thread_count);
-    }
-    else
-      mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
+    mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
     DBUG_PRINT("quit",("One thread died (count=%u)",thread_count));
   }
   mysql_mutex_unlock(&LOCK_thread_count);