From: Konstantin Osipov
Date: August 13 2010 2:40pm
Subject: bzr commit into mysql-5.5-bugfixing branch (kostja:3108) Bug#55001
List-Archive: http://lists.mysql.com/commits/115695
X-Bug: 55001
Message-Id: <20100813144026.89EEF1E6039@ibbur.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_hoBSbQTkdNpdcZkF84j7xw)"

--Boundary_(ID_hoBSbQTkdNpdcZkF84j7xw)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///opt/local/work/5.5-runtime/ based on revid:kostja@stripped

 3108 Konstantin Osipov	2010-08-13
      A draft patch for Bug#55001 "Change in behavior:
       thread_concurrency (docs, example files)"
      Put the variable back, on all platforms.
      The variable is unused and has no effect, already in 5.1, but
      will be removed along with others in scope of deprecation process.

    modified:
      sql/sys_vars.cc
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-08-12 13:50:23 +0000
+++ b/sql/sys_vars.cc	2010-08-13 14:40:19 +0000
@@ -1617,14 +1617,12 @@ static Sys_var_charptr Sys_socket(
        READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG),
        IN_FS_CHARSET, DEFAULT(0));
 
-#ifdef HAVE_THR_SETCONCURRENCY
 static Sys_var_ulong Sys_thread_concurrency(
        "thread_concurrency",
        "Permits the application to give the threads system a hint for "
        "the desired number of threads that should be run at the same time",
        READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1));
-#endif
 
 static Sys_var_ulong Sys_thread_stack(
        "thread_stack", "The stack size for each thread",


--Boundary_(ID_hoBSbQTkdNpdcZkF84j7xw)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/kostja@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/kostja@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kostja@stripped
# target_branch: file:///opt/local/work/5.5-runtime/
# testament_sha1: dd59fc398baabe1120a363042d083914e94dd3e9
# timestamp: 2010-08-13 18:40:26 +0400
# source_branch: file:///home/kostja/work/trunk-runtime-lockopen/
# base_revision_id: kostja@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfiFPKcAAZPfgAAQWGf/93oI
xAC////wUAO28BprhA7ZhogFTZqnhpTyTwTGpPU0yANAaDJCTZGUn6p6nsRTTBNAYhppkAII0yp6
TT1A0yGQA0ABoAGA0AAA0AAAAAASRI0NJgQ00E09Camp+lGg2p6mmaXUHDLzDJ0YJQ6n9Lw2aiJu
UtaqQq/Ud44IiHj6itmSKheU6wRp+/KBwoLjUZ89VDUDrVLEBH6KZjFWw69CCmDCJs6pz357suHD
dLH9h+zik51snk+XIXIsPgRospspVmfnxxthra2H4JJD4vTnqmDsy2M8oCHK+rOIhq32xFRefBlT
GNJIFMQTJh+rQqj4SsLIuod9JhH0vkbyXnwPKE2yVUSRHJRQfUv+FQtiscWP3t1QVbFe01z99Bxa
vC2zMXZ24WnAxkdBTyOAKqvB2YthPjRqhcLiRgxgwSNY5PqXFLkVlY1gUJDydr1WT0513xjZZmTJ
NWtBlXwHWbJcAhZKYpbAoP/0Vuvln5a68lsmoPz0XiLm3v61mwVoBeMZuwIQRe4RshF+7YDCJ0ut
WykrFysFhKectBNKG87FBnt5i2U7tRfXh8lsEFNwX7mrmYekmRrYrqJypWQvhWM7vG2hp2RuYRgk
hGCgCKW8JZsb6ZBbT02ziISOrkJB3jrG5rgfE6Ng2Hf1mB3Dhl9Op+UjnmGXPwUnP2a9mL7mDkqN
qhDoxVSreQeQMlXhOiKFRaNBjjfHxJgqG+hJpNBNRmQeUixmeSHBVvcVXHw23Xyg2kQn6YukcDBn
poMp6nLYJTcSyNJPrOs6RzSuyZm4vQ3RyCUwGJhnEKw1jVwGCJOoDV5hmtsLhTRu686Tm5drr4LY
dnNApAoIyZvFiIdk1l+WsiSC8xkp+WO4zMdMoLeXE+Hx0tOl7r0w6PN3aCLlb5aLOpvYTbw+9mMf
m5yxYDk7cQv/vwmm6GIe0FYMx3CvxvuhHEO7UuFXWbtFI8xXG5fYoxCwP8P5Ge+s98wtCDh19PR3
dcmbLs5R6pHNQjYxhyj2sooGpKVFmZpJDLjO9DzhDYO8N0e1U9JVQ6pZQdPq0tp0avgCalD+MfxG
ZpR5g4bnXVIlhNYb5smZNpMR1lOypjXyXKqyT22TrPtAFjBRQGfdg6E2kZdDAsQz2mc+GzatFTXG
3Eyeqtd1i7MA+KaHPhpGdIpmA/kSla1uwstiRIPykNG8t29HgZVP9RRh5mo2k0I3X7TlHbDFvtND
fZrGmsSThMypw1e+uhIo1Prq0+fW5loLiVDTUK+gEzzBUPc7HcGN5KMbpIPA2i9wPE3COItzD/F3
JFOFCQ+IU8pw


--Boundary_(ID_hoBSbQTkdNpdcZkF84j7xw)--