Added possibility to use string values 'true' and 'false' case

insensitively with boolean options. Added a warning if given
value is invalid and skips the option handling in that case.

1 files changed, 15 insertions, 3 deletions

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 68bf65b2abe..e9e20fe4024 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -342,11 +342,23 @@ int handle_options(int *argc, char ***argv,
 	      --enable-'option-name'.
 	      *optend was set to '0' if one used --disable-option
 	      */
-	    my_bool tmp= (my_bool) (!optend || *optend == '1');
-	    *((my_bool*) value)= tmp;
 	    (*argc)--;
+	    if (!optend || *optend == '1' ||
+		!my_strcasecmp(&my_charset_latin1, optend, "true"))
+	      *((my_bool*) value)= (my_bool) 1;
+	    else if (*optend == '0' ||
+		     !my_strcasecmp(&my_charset_latin1, optend, "false"))
+	      *((my_bool*) value)= (my_bool) 0;
+	    else
+	    {
+	      my_getopt_error_reporter(WARNING_LEVEL,
+				       "%s: ignoring option '--%s' due to \
+invalid value '%s'\n",
+				       my_progname, optp->name, optend);
+	      continue;
+	    }
 	    get_one_option(optp->id, optp,
-			   tmp ? (char*) "1" : disabled_my_option);
+			   value ? (char*) "1" : disabled_my_option);
 	    continue;
 	  }
 	  argument= optend;