From: Date: May 5 2009 3:16pm
Subject: bzr commit into mysql-6.0 branch (guilhem:2756) Bug#40368
List-Archive: http://lists.mysql.com/commits/73391
X-Bug: 40368
Message-Id: <20090505131614.54AA812694@guilhem-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7370273278516571760=="

--===============7370273278516571760==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/ based on revid:serg@stripped

 2756 Guilhem Bichot	2009-05-05
      Fix for BUG#40368 "mysqld_safe not honouring underscore same as dash on server options".
      Such bug led "mysqld_safe --core_file_size=#" to not work because mysqld_safe wouldn't recognize
      that "ulimit -c" is needed; only --core-file-size=# worked. Same for --open_files_limit and other
      options with _ where mysqld_safe needs to do something more than passing to mysqld.
      Original fix by Erik Ljungstrom erik at ibiblio dot org ; slightly modified here.
      Tested on all internally accessible Unix.

    modified:
      scripts/mysqld_safe.sh
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2009-03-18 21:59:44 +0000
+++ b/scripts/mysqld_safe.sh	2009-05-05 13:16:09 +0000
@@ -155,7 +155,13 @@ parse_arguments() {
   fi
 
   for arg do
-    val=`echo "$arg" | sed -e "s;--[^=]*=;;"`
+    # the parameter after "=", or the whole $arg if no match
+    val=`echo "$arg" | sed -e 's;^--[^=]*=;;'`
+    # what's before "=", or the whole $arg if no match
+    optname=`echo "$arg" | sed -e 's/^\(--[^=]*\)=.*$/\1/'`
+    # replace "_" by "-" ; mysqld_safe must accept "_" like mysqld does.
+    optname_subst=`echo "$optname" | sed 's/_/-/g'`
+    arg=`echo $arg | sed "s/^$optname/$optname_subst/"`
     case "$arg" in
       # these get passed explicitly to mysqld
       --basedir=*) MY_BASEDIR_VERSION="$val" ;;


--===============7370273278516571760==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/guilhem@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: guilhem@stripped
# target_branch: file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/
# testament_sha1: bf525249d569e87d75024c081724696a4d5e4999
# timestamp: 2009-05-05 15:16:14 +0200
# base_revision_id: serg@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb5oMEcAAgZfgEAQXff//1OE
jg/////0UAVtpvacpbqzdnKLuxbmEkQqejTU9Jmmk8iNGKbU8KZpDQ9RiYgyBKImEYImTSnpNP1R
p6gAAANA0AEoI1BU/KbIChmk8mKB4o9TamjI0aaD1A5oyYmACYjAjTAgxGCZMAjBJITEI0nkm0Gk
yZJkzSNGmjRo0aANHV9grx8/W3hwiY5Ox9sbNMpDKhr1TPJRAyWvPlj5Q+V6CEIlycpQv57dKs5D
M630NROZmO3CqqeHeRKtSeI1Wuj0y+1frrjxq6FmugdUJfyF2mi0nh+FjLAjMsMhcOtZU9Q+9iU7
H8RYqwU3ewtm9Fd89bp5J/4IrsgnRUOW4GWX4gnZJ5wmjFuqs8+nplsy8ojV6lW6641pxFxsIxNo
wxib3Q4zMDbU5w7Yqxek3VF7KcsVm832vr9ChUd0li1ldgjqwW4lydDzCB8BckdeKUzpjIp64XUO
17q55EhEF7b9l518yXdG+n5obMGZqxHzs3tVZGEwOIUJMc5WKHmrSOioIGFC8UBHePJSIlBV7ZDC
fiRvreGiNeFWN9zxeA8/I1yxjUidTIyw9lhl0D6zGfsHZaQRCya6ldCLE/QwJsMzhxKESkRGqcEo
NLjVmd1B5QcONxuEroTivpulf5+DyD1FcmZxpivQipkJHbnH/yvWXK15isQQPFwnGVW5hkZBqpY7
jp0irKfYwEbxSY3VMbD9lcuEkU2E/vhd/iVHtDWou/10LyiHQlDclkuG30ixfGJm9tDbeJEi4aIL
zGyOv2UTeSKy0dAqzMoph/EVhRfS3Dt9XB/gpsL5sYHT0QXtoZt3MMoKfXs4j9FXZZxNWF6GLFZ/
XbSjCSvUUbH5tBsXrdhFmOl9RhqwWjZPYeacemoK3FiYg+2sUsqwlPiloUBx1E+HA91xn01Way8C
FOoMXfgm8+TIkVTvxP8aEuCPl7uK2U0Yu4b8+sqNxxlwwqest/xKxjqDnva46yy9U3GcdPJyVTB8
2iM/vSMeEjWJzqEXMq73vYttNh2CkoKJePcrBcVIrNAUQj2jiZ5Tmblpl4Hv58/PUZDE3oVWpjM5
ocUabwru8dZ8TI+e3LSMLYykdmlBwXDHlanv6gi/IObSeXbMDbE0zJ+0tiBhDcmFZCwhXe+BaGD6
KQhhlOPRnMbecnGQCtOmce9bCwzmc36yByicMTKTlE31dzZz7DatjibLlJ9VAp61pup12sGm4KPI
Z+jwI/zunNyaY26DpbODdDODQZvFlX1APCx5BAg/dqzLi0izWlyjZDsx25xdF4unMrqcTDopbQJD
yXFuC3hbVH788X0xAqJQwA6jS1/1rnTTp5jynWyJ7VWEuf6tsIwI3TKGvZe2Ar6849vGSEZrhopF
ayCd5USxK9yDSb3m7kpyKyHN14AWN0ut1gKEG7PXC46owKExLaPFYvz7JETlOxxmbIUXi83BlcwQ
tylIy7JlAapRHhCGby3ykDdDGKlkzIZNstoWy6Bi7zXtnWgd0Q0rbUqom5oci9Q2z7juVbDSoMlV
S7ylyd96UyyWGkW7gwEk9OXLkjYbh5ghnyaqqhoUJX7zuFd7sxcJHAwqKhja4cd7OB9e0fBkzZvR
ETrdjrmT40CkmaXn+H5sPWpjMobSekOsgqGTL7YsN20ql1STnjDVi5zA49z7nhTvTqbPFQKiosAz
BZpeYHWXtCITSdOcaUDnkM1hvszFjWrmrL3VZZD5OAzjNpoxxjKbG6VSyhfKOYDqVBksCsFdiTK6
5EyeO84cvrWlTlxX9VEuXXHm23BVLDotw2AZS8oqU0Y2G/ABaoJWk62FhQzUtzvpLqhDRkpEj5uw
rOOKD5vpvvO9kH/F3JFOFCQvmgwRwA==


--===============7370273278516571760==--