bk commit into 5.0 tree (jani:1.1854) BUG#6593

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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
  1.1854 05/04/19 00:22:57 jani@stripped +1 -0
  Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)"

  mysys/my_getopt.c
    1.51 05/04/19 00:21:01 jani@stripped +2 -1
    Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)"

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0-dev

--- 1.50/mysys/my_getopt.c	Wed Sep  1 04:12:06 2004
+++ 1.51/mysys/my_getopt.c	Tue Apr 19 00:21:01 2005
@@ -205,7 +205,8 @@
 	    {
 	      if (!getopt_compare_strings(special_opt_prefix[i], opt_str,
 					  special_opt_prefix_lengths[i]) &&
-		  opt_str[special_opt_prefix_lengths[i]] == '-')
+		  (opt_str[special_opt_prefix_lengths[i]] == '-' ||
+		   opt_str[special_opt_prefix_lengths[i]] == '_'))
 	      {
 		/*
 		  We were called with a special prefix, we can reuse opt_found