[Commits] Rev 3215: - Restore thread_handlng default back to one-thread-per-connection in file:///H:/bzr/5.5-threadpool/

Vladislav Vaintroub wlad at montyprogram.com
Fri Jan 27 14:59:08 EET 2012


At file:///H:/bzr/5.5-threadpool/

------------------------------------------------------------
revno: 3215
revision-id: wlad at montyprogram.com-20120127125845-9u08bpdy1ac0osk6
parent: wlad at montyprogram.com-20120126234012-tvr3x3a6ekah2k2e
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5-threadpool
timestamp: Fri 2012-01-27 13:58:45 +0100
message:
  - Restore thread_handlng default back to one-thread-per-connection
  - Some whiltespace coding style changes.
-------------- next part --------------
=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2012-01-24 00:59:03 +0000
+++ b/sql/net_serv.cc	2012-01-27 12:58:45 +0000
@@ -1159,7 +1159,7 @@
 {
   DBUG_ENTER("my_net_set_read_timeout");
   DBUG_PRINT("enter", ("timeout: %d", timeout));
-  if(net->read_timeout == timeout)
+  if (net->read_timeout == timeout)
     DBUG_VOID_RETURN;
   net->read_timeout= timeout;
 #ifdef NO_ALARM
@@ -1174,7 +1174,7 @@
 {
   DBUG_ENTER("my_net_set_write_timeout");
   DBUG_PRINT("enter", ("timeout: %d", timeout));
-  if(net->write_timeout == timeout)
+  if (net->write_timeout == timeout)
     DBUG_VOID_RETURN;
   net->write_timeout= timeout;
 #ifdef NO_ALARM

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2012-01-26 03:35:54 +0000
+++ b/sql/sql_class.cc	2012-01-27 12:58:45 +0000
@@ -1630,7 +1630,7 @@
 
   /* Disconnect even if a active vio is not associated. */
   if (net.vio != vio)
-     vio_close(net.vio);
+    vio_close(net.vio);
 
   mysql_mutex_unlock(&LOCK_thd_data);
 }

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2012-01-26 03:35:54 +0000
+++ b/sql/sys_vars.cc	2012-01-27 12:58:45 +0000
@@ -1823,11 +1823,7 @@
 #endif
        , READ_ONLY GLOBAL_VAR(thread_handling), CMD_LINE(REQUIRED_ARG),
        thread_handling_names, 
-#ifdef HAVE_POOL_OF_THREADS
-       DEFAULT(2)
-#else
        DEFAULT(0)
-#endif
  );
 
 #ifdef HAVE_QUERY_CACHE



More information about the commits mailing list