bk commit into 5.1 tree (jani:1.2176)

[jani]

Below is the list of changes that have just been committed into a local
5.1 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.2176 06/05/23 18:27:54 jani@stripped +3 -0
  Removed wrong ascii codes from source code.
  Fixed core dump in --help

  sql/mysqld.cc
    1.550 06/05/23 18:27:48 jani@stripped +1 -1
    Wrong type.

  mysys/my_getopt.c
    1.56 06/05/23 18:27:48 jani@stripped +1 -1
    Removed a wrong character (ascii 0xa0), which looked like a space.
    This will cause some debuggers display the source code in a wrong
    way. May cut the rest of the file off and looks like a debugger
    problem, which it isn't.
    

  include/heap.h
    1.27 06/05/23 18:27:47 jani@stripped +1 -1
    Removed a wrong character (ascii 0xa0), which looked like a space.
    This will cause some debuggers display the source code in a wrong
    way. May cut the rest of the file off and looks like a debugger
    problem, which it isn't.
    

# 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:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.1-new

--- 1.26/include/heap.h	2006-02-08 22:52:04 +02:00
+++ 1.27/include/heap.h	2006-05-23 18:27:47 +03:00
@@ -111,7 +111,7 @@
 
 typedef struct st_hp_keydef		/* Key definition with open */
 {
+  uint flag;				/* HA_NOSAME | HA_NULL_PART_KEY */
   uint keysegs;				/* Number of key-segment */
   uint length;				/* Length of key (automatic) */
   uint8 algorithm;			/* HASH / BTREE */

--- 1.549/sql/mysqld.cc	2006-05-23 14:32:13 +03:00
+++ 1.550/sql/mysqld.cc	2006-05-23 18:27:48 +03:00
@@ -5004,7 +5004,7 @@
    (gptr*) &global_system_variables.engine_condition_pushdown,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"event-scheduler", OPT_EVENT_SCHEDULER, "Enable/disable the event scheduler.",
-   (gptr*) &Events::opt_event_scheduler, (gptr*) &Events::opt_event_scheduler, 0, GET_STR,
+   (gptr*) &Events::opt_event_scheduler, (gptr*) &Events::opt_event_scheduler, 0, GET_ULONG,
     REQUIRED_ARG, 2/*default*/, 0/*min-value*/, 2/*max-value*/, 0, 0, 0},
   {"exit-info", 'T', "Used for debugging;  Use at your own risk!", 0, 0, 0,
    GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0},

--- 1.55/mysys/my_getopt.c	2005-10-27 20:04:32 +03:00
+++ 1.56/mysys/my_getopt.c	2006-05-23 18:27:48 +03:00
@@ -486,7 +486,7 @@
       }
       get_one_option(optp->id, optp, argument);
 
+      (*argc)--; /* option handled (short or long), decrease argument count */
     }
     else /* non-option found */
       (*argv)[argvpos++]= cur_arg;