List:Commits« Previous MessageNext Message »
From:tim Date:November 27 2006 10:02pm
Subject:bk commit into 5.1 tree (tsmith:1.2396) BUG#23883
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-27 15:01:14-07:00, tsmith@stripped +1 -0
  raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883)

  sql/mysqld.cc@stripped, 2006-11-27 15:00:56-07:00, tsmith@stripped +3 -1
    raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/51

--- 1.592/sql/mysqld.cc	2006-11-27 15:01:59 -07:00
+++ 1.593/sql/mysqld.cc	2006-11-27 15:01:59 -07:00
@@ -5943,9 +5943,11 @@ The minimum value for this variable is 4
    "If there is more than this number of interrupted connections from a host this host will be blocked from further connections.",
    (gptr*) &max_connect_errors, (gptr*) &max_connect_errors, 0, GET_ULONG,
     REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ~0L, 0, 1, 0},
+  // Default max_connections of 151 is larger than Apache's default max
+  // children, to avoid "too many connections" error in a common setup
   {"max_connections", OPT_MAX_CONNECTIONS,
    "The number of simultaneous clients allowed.", (gptr*) &max_connections,
-   (gptr*) &max_connections, 0, GET_ULONG, REQUIRED_ARG, 100, 1, 16384, 0, 1,
+   (gptr*) &max_connections, 0, GET_ULONG, REQUIRED_ARG, 151, 1, 16384, 0, 1,
    0},
   {"max_delayed_threads", OPT_MAX_DELAYED_THREADS,
    "Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero, which means INSERT DELAYED is not used.",
Thread
bk commit into 5.1 tree (tsmith:1.2396) BUG#23883tim27 Nov