bk commit into 5.0 tree (sasha:1.2028) BUG#12974

[Sasha Pachev]

Below is the list of changes that have just been committed into a local
5.0 repository of sasha. When sasha 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.2028 05/10/22 18:17:11 sasha@stripped +1 -0
  fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is
used

  sql/mysqld.cc
    1.517 05/10/22 18:16:54 sasha@stripped +1 -1
    fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is
used

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-5.0-bug12974

--- 1.516/sql/mysqld.cc	2005-10-19 14:43:41 -06:00
+++ 1.517/sql/mysqld.cc	2005-10-22 18:16:54 -06:00
@@ -5212,7 +5212,7 @@
   {"sql-bin-update-same", OPT_SQL_BIN_UPDATE_SAME,
    "The update log is deprecated since version 5.0, is replaced by the binary \
 log and this option does nothing anymore.",
-   0, 0, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+   0, 0, 0, GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"sql-mode", OPT_SQL_MODE,
    "Syntax: sql-mode=option[,option[,option...]] where option can be one of:
REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY,
NO_UNSIGNED_SUBTRACTION.",
    (gptr*) &sql_mode_str, (gptr*) &sql_mode_str, 0, GET_STR, REQUIRED_ARG, 0,