From: Kristofer Pettersson
Date: October 8 2010 11:30am
Subject: bzr commit into mysql-5.5-bugteam branch (kristofer.pettersson:3095)
 Bug#54569
List-Archive: http://lists.mysql.com/commits/120361
X-Bug: 54569
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3032039055620690208=="

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

#At file:///home/thek/bzr/mysql-5.5-bugteam/ based on revid:bar@stripped

 3095 Kristofer Pettersson	2010-10-08
      Bug#54569 Some options are not allowed to take argument when passed with loose- prefix
      
      Boolean options cause parsing failures when they are given
      with prefix loose- and an argument, either in the command
      line or in configuration file.
      
      The reason was a faulty logic which forced the parsing
      to throw an error when an argument of type NO_ARG was
      used together with an argument which has been identified
      as a key-value pair. Despite the attribute NO_ARG these
      options actually take arguments if they are of type
      BOOL.
     @ mysys/my_getopt.c
        * removed if-statement which prevented logic for handling boolean types with arguments to be executed.

    modified:
      mysys/my_getopt.c
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-09-28 15:15:58 +0000
+++ b/mysys/my_getopt.c	2010-10-08 11:30:49 +0000
@@ -360,14 +360,6 @@ int handle_options(int *argc, char ***ar
 	  }
 	  return EXIT_OPTION_DISABLED;
 	}
-	if (must_be_var && optp->arg_type == NO_ARG)
-	{
-	  if (my_getopt_print_errors)
-            my_getopt_error_reporter(ERROR_LEVEL, 
-                                     "%s: option '%s' cannot take an argument",
-                                     my_progname, optp->name);
-	  return EXIT_NO_ARGUMENT_ALLOWED;
-	}
         error= 0;
 	value= optp->var_type & GET_ASK_ADDR ?
 	  (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp, &error) :


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kristofer.pettersson@stripped\
#   vqimd8nrt9ijxvdh
# target_branch: file:///home/thek/bzr/mysql-5.5-bugteam/
# testament_sha1: f5cb870cc7edd74a44b881ab7fd656d8f02dfe15
# timestamp: 2010-10-08 13:30:55 +0200
# base_revision_id: bar@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR/2360AAbDfgEAQWHf/93aN
3AC////wUATs8FBqlsAAVwlTQphqnspqHpoyaahpoGZTQ0GmnqAHMAmmATIYAAmCYAAANEaEyp5T
2VPNU8KPUPU2oAAADQBzAJpgEyGAAJgmAAACSQTTRoTJlNoTTTU9J6ahMmU009QzTSfql/5Nlzm/
43DcmQzcdU0DxQjRQ9dbIq4mRt3YcH0+dqIg31GtG1wWS1KbGkTtqKDZy/OD9cbYGDceDLTWzM1J
6LXOj4gkUbDZCB6nbzr3iRwN5oYXFoXqYJQUEdsdivd1bA8hFqXVYuHvl6vjfq3f5DmF4dofGmI+
a/Aj8PXJeuVdeayw3PzdMVX+c850qtRS9TSrSyhbCl8Q0Y9zdU5MmSZkDITZGfbJQMXitUF62Koe
gqGgnqBtnGHlmXI5RSDfSEjQs7YlBX/aNUV6qio1cKPLRTG6r+rI17Zp8n+/dHvQ8ZQalOfms3rI
4NvVa4OEYrcZK5pVKTTXYRtLdO+FiwH6q1h32wpZMAEYZBAlir25UwwURslxn5Wp2Zhm/yxwcuiw
7rfUJrZOdzxJQ6XR5SeNLNbJ/r41BbQGUSxXKL/dkQULjx4s1TGlsdhpFbL1yqPFWHS8gMXzyteP
VHRKv7uhfFWl7hR02NyKyjXV1jEBVOztTkqyrbrVq6zq0YmR2FQts1cXLCcRozyaWcokBiTKLoM5
TCVbfM1pdP1zexz/xt4KpLp+SsmQRW9OqDfkZg0S3AZwEkxHaolfQtR362EgsNX9Xn2+CUrOVpAO
1VDz072d/b5K7bOoHlPJ+f10T1ghhMf6KopWyDlrdJybNCaqhrtZPSqU2JYyymqgELg4h1zoWpy5
aTsXi1jMk9Ingz6RTVDJfBtMOdxIiSWdSdvFFR3aPpmXcxcSy9S+1KVR5O7nM6ZaqdN9VjWOJCMF
9LrzStUG36McRpnfy1iQHBPiYSwI/DLmfInXQMsNuOm1dFVx4xGOBZsm+o8/VUYWOQxgQQI4yWFl
cwGRMxonU4DyrbWf420XjBMj8ySrRZYqjOu3ocE7nuPTrmMUPR/gQsAmWpuP4pZzc7iRHA85PXv9
uuwV37IYnVqK/0W03noMNweOZ/FdFDoFpFe2deKgppjJ648VDUY1yPMxTtYL9NQxdZN5gOf8hfBw
uP3FEkuoVbLNz2/PnrVOIMi1u4bQN+oZ+7XaWYYxZcxchzr19lpvCf6K77n0G8N3AIhINjl+dJYL
FJl2MeHk5zdm2hQe+W+FYiANu4KoTyElgyuImKr6Vkq5GnNeD/7T3VW1urT2e9zPZzyjCNj1EGZ4
yJQ+ooKQKLIZYq5cvNNlMeg2kzwSPP2ccaMyZJu73L9/rMoWo43F7Q3JRCAcnLYereMrHbAsODMm
TPOpJv2S6r6Kv538/3VFS0CEVnwFMPRNr5VjdHOeMIZ6ekSm56dbYM9D3274kRT3evt8ErVCFm/p
XMYDiJqwenjNWQN47If7k2NY0MV6X3GYOnYtK72S7dmtvwBlVQB11wFQbujqyvHIWaLRQfyNTYaX
Q+NUJZoKzpWEHp2TgfdSeBC9SUjjgA56HBJUZTZWxAH6VPJ77k0no+wFQLlI5kXUumCtjGRGBBoJ
kgcVILdtqZd7S1W7F9E5MJjTTBz2qXZHVVLwHi099CfuR0LuSKcKEgP+2/Wg


--===============3032039055620690208==--