into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
include/my_net.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

Add linebreak


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run-shell to the ignore list

Symlink mysql-test-run to mysql-test-run.pl


mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Build a link to mysql-test-run.pl called mysql-test-run

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


zlib/Makefile.am:
  Auto merged

into  mysql.com:/usr/home/ram/work/5.0.b18267


zlib/Makefile.am:
  Auto merged

 - Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.


mysql-test/mysql-test-run.pl:
  Allow --skip-core-file to be specified in master.opt file, which will turn
  off the default behaviour to generate core file.
  Remove the option --exit-info from being passed to myslqd when it's started. If used 
  it will just overwrite all the options for skip-stack-trace etc.
mysql-test/t/disabled.def:
  Enable crash_commit_before
mysql-test/t/crash_commit_before-master.opt:
  Run crash_commit_before test case without core file and stack trace.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/my_net.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_net.h:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/Makefile.am:
  Auto merged
vio/viosocket.c:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  SCCS merged

into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/work/my50-work

into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_global.h:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/work/my50-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/Makefile.am:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139


tests/Makefile.am:
  Auto merged

into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

extra/yassl/testsuite/test.hpp:
  Remove define for __MACH__
  http://bugs.debian.org/387369

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint