Commit 09a895d9 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 1bef73c2 f945555c

BUILD/compile-hpux11-parisc2-aCC

+10 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ release_flags="-fast +O3" 
#                note on pointers below.

cflags="-g -z +O0"

cxxflags="-g0 -z +O0"

debug_conigure_options="--with-debug"

debug_configure_options="--with-debug"



while [ "$#" != 0 ]; do 

  case "$1" in

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ igor@hundin.mysql.fi 
igor@rurik.mysql.com

ingo@mysql.com

jan@hundin.mysql.fi

jani@a193-229-222-105.elisa-laajakaista.fi

jani@a193-229-222-2.elisa-laajakaista.fi

jani@a80-186-24-72.elisa-laajakaista.fi

jani@a80-186-41-201.elisa-laajakaista.fi

BitKeeper/triggers/post-commit

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ then 


CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`



if [ "$BUG" = "" ]

then
@@ -37,7 +38,7 @@ fi 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $TO

Subject: bk commit - $VERSION tree ($CHANGESET)$BUG

Subject: bk commit - $VERSION tree ($CHANGESET)${BUG}${WL}



EOF

  bk changes -v -r+

Docs/Support/texi2html

+1 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ sub fix_image 
{

  my($text) = @_;

  my($arg1, $ext);

  $text =~ /^([^,]*)$/;

  $text =~ /^([^,]*)/;

  die "error in image: '$text'" unless defined($1);

  $arg1 = $1;

  $arg1 =~ s/@@/@/g;

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -423,6 +423,10 @@ SOURCE=..\mysys\my_static.c 
# End Source File

# Begin Source File



SOURCE=..\strings\my_strtoll10.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_symlink.c

# End Source File

# Begin Source File