Commit 88fe390a authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents 4e2f80b4 0c549e36

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ arjen@george.bitbike.com 
bar@bar.intranet.mysql.r18.ru

bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bar@mysql.com

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

Build-tools/Bootstrap

+6 −4
Original line number Diff line number Diff line
@@ -123,14 +123,16 @@ if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run)) 
if ($opt_pull)

{

	&logger("Updating BK tree $REPO to latest ChangeSet first");

	$command= "cd $REPO; bk pull; cd ..";

	&run_command($command, "Could not update $REPO!");

  chdir ($REPO) or &abort("Could not chdir to $REPO!");

	&run_command("bk pull", "Could not update $REPO!");

  chdir ($PWD) or &abort("Could not chdir to $PWD!");



	unless ($opt_skip_manual)

	{

		&logger("Updating manual tree in $opt_docdir");

		$command= "cd $opt_docdir; bk pull; cd ..";

		&run_command($command, "Could not update $opt_docdir!");

    chdir ($opt_docdir) or &abort("Could not chdir to $opt_docdir!");

	  &run_command("bk pull", "Could not update $opt_docdir!");

    chdir ($PWD) or &abort("Could not chdir to $PWD!");

	}

}

VC++Files/sql/message.mc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
MessageId    = 100

Severity     = Error

Facility     = Application

SymbolicName = MSG_DEFAULT

Language     = English

%1For more information, see Help and Support Center at http://www.mysql.com.

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ 
/* READLINE: */

#undef VOID_SIGHANDLER



/* Define this if you want extra character set conversion table*/

#undef DEFINE_ALL_CHARACTER_SETS





/* Leave that blank line there!!  Autoheader needs it.

   If you're adding to this file, keep in mind:

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -2262,9 +2262,11 @@ elif test "$extra_charsets" = complex; then 
  CHARSETS=`/bin/ls -1 $srcdir/strings/ctype-*.c | \

                  sed -e 's;^.*/ctype-;;' -e 's;.c$;;'`

  CHARSETS=`echo $CHARSETS`     # get rid of line breaks

  AC_DEFINE([DEFINE_ALL_CHARACTER_SETS])

else

  if test "$extra_charsets" = all; then

    CHARSETS="$CHARSETS_AVAILABLE $CHARSETS_DEPRECATED"

    AC_DEFINE([DEFINE_ALL_CHARACTER_SETS])

  else

    CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'`

  fi