Commit 12aef413 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
parents 40ec2403 8c911a25

BitKeeper/triggers/post-commit

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#shift

FROM=$USER@mysql.com

INTERNALS=internals@lists.mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="4.1"
@@ -61,14 +61,14 @@ EOF 
 ) | head -n $LIMIT | /usr/sbin/sendmail -t



#++

# internals@ mail

# commits@ mail

#--

 echo "Notifying internals list at $INTERNALS"

 echo "Notifying commits list at $COMMITS"

 (

   cat <<EOF

List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

To: $COMMITS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static struct my_option my_long_options[] = 
  {"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,

   0, 0, 0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"auto-rehash", OPT_AUTO_REHASH,

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static TYPELIB command_typelib= 
static struct my_option my_long_options[] =

{

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"count", 'c',

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static struct my_option my_long_options[] = 
{



#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

#ifndef DBUG_OFF

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"auto-repair", OPT_AUTO_REPAIR,