Commit 0e9b1c1d authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 

into hundin.mysql.fi:/home/marko/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 198578d6 12e4d1c8

.bzrignore

+8 −4
Original line number Diff line number Diff line
@@ -254,11 +254,14 @@ bkpush.log 
bkpush.log*

build.log

build_tags.sh

client/decimal.c

client/insert_test

client/log_event.cc

client/log_event.h

client/mf_iocache.c

client/mf_iocache.cc

client/my_decimal.cc

client/my_decimal.h

client/mysql

client/mysqladmin

client/mysqladmin.c
@@ -328,9 +331,12 @@ help.h 
include/my_config.h

include/my_global.h

include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h

include/readline

include/readline/*.h

include/readline/readline.h

include/sql_state.h

include/widec.h

innobase/autom4te-2.53.cache/*

innobase/autom4te-2.53.cache/output.0
@@ -432,6 +438,7 @@ libmysqld/log_event.cc 
libmysqld/md5.c

libmysqld/mf_iocache.cc

libmysqld/mini_client.cc

libmysqld/my_decimal.cc

libmysqld/my_time.c

libmysqld/net_pkg.cc

libmysqld/net_serv.cc
@@ -985,6 +992,7 @@ support-files/mysql-3.23.29-gamma.spec 
support-files/mysql-log-rotate

support-files/mysql.server

support-files/mysql.spec

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

tags

test/ndbapi/bank/bankCreator

test/ndbapi/bank/bankMakeGL
@@ -1052,7 +1060,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
include/mysqld_ername.h

include/mysqld_error.h

include/sql_state.h

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

BitKeeper/etc/gone

+392 −12

File changed.

Preview size limit exceeded, changes collapsed.

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ monty@tramp.mysql.fi 
monty@work.mysql.com

mronstrom@build.mysql.com

mronstrom@mysql.com

mskold@bk-internal.mysql.com

mskold@mysql.com

msvensson@build.mysql.com

msvensson@neptunus.homeip.net

BitKeeper/triggers/post-commit

+13 −6
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,15 @@ 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 +88,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
@@ -811,7 +811,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)
@@ -835,7 +835,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)

      {