Commit 276c90cd authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents a50ef33d 95d3d98b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1007,3 +1007,4 @@ tests/mysql_client_test 
libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest_embedded

support-files/ndb-config-2-node.ini

BitKeeper/triggers/post-commit

+13 −7
Original line number Diff line number Diff line
@@ -20,14 +20,20 @@ if [ "$BK_STATUS" = OK ] 
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'`

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

  TO=dev-public@mysql.com

  BS=""

  BH=""

else

  TO=dev-bugs@mysql.com

  BS=" BUG#$BUG"

# need newline here

  BH="X-Bug: $BUG

"

fi

#++

# dev-public@ / dev-bugs@
@@ -38,8 +44,8 @@ fi 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $TO

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



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

$BH

EOF

  bk changes -v -r+

  bk cset -r+ -d
@@ -54,14 +60,14 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

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



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

$BH

Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER 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://www.mysql.com/doc/I/n/Installing_source_tree.html

see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html



EOF

  bk changes -v -r+
@@ -81,7 +87,7 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $DOCS

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

Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS



EOF

  bk changes -v -r+

Build-tools/Do-compile

+4 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ sub find 
sub rm_all

{

  my(@rm_files)=@_;

  my($dir,$current_dir,@files,@dirs);

  my($dir,$current_dir,@files,@dirs,$removed);

  $current_dir = `pwd`; chomp($current_dir);



  foreach $dir (@rm_files)
@@ -830,7 +830,9 @@ sub rm_all 
      }

      if ($#files >= 0)

      {

	system("rm -f " . join(" ",@files)) && abort("Can't remove files from $dir");

	$removed= unlink @files;

	print "rm_all : removed $removed files in $current_dir/$dir\n" if ($opt_debug);

	abort("Can't remove all $#files+1 from $current_dir/$dir, just $removed") if $removed != $#files+1;

      }

      foreach $dir (@dirs)

      {

Build-tools/mysql-copyright-2

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ sub add_copyright 
    $line_copyright= "! ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.sql$/)

  {

    $start_copyright="-- ";

    $line_copyright= "-- ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.asm$/)

  {

    $start_copyright="; ";

VC++Files/tests/mysql_client_test.dsp

+6 −6
Original line number Diff line number Diff line
@@ -66,18 +66,18 @@ LINK32=link.exe 
# PROP Output_Dir ".\Release"

# PROP Intermediate_Dir ".\Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD BASE RSC /l 1033 

# ADD RSC /l 1033 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF