debian/rules:
  --with-yassl is deprecated. Changed to --with-ssl
debian/libmysqlclientSLIB-dev.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-client-BASE.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-test-BASE.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-server-BASE.files.in:
  Removing mention of files no longer in 5.1

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian

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


mysys/my_thr_init.c:
  Auto merged

into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-maint


BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged

  Left a stray space in. 


debian/control.in:
  Left a stray space in.

  Renamed libmysqlclient package entires 


debian/Makefile.am:
  Renamed libmysqlclient package entires

  Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on. 
libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in


debian/libmysqlclientSLIBoff.README.Debian.in:
  Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
debian/libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
debian/libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
debian/libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
debian/libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
debian/control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged

  Fix test case: add drop table


mysql-test/t/innodb_mysql.test:
  Fix test case: add drop table
mysql-test/r/innodb_mysql.result:
  Fix test case: add drop table

  Protect the control file from running ./configure again


debian/rules:
  Protect the control file from running ./configure again

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


mysys/my_thr_init.c:
  Auto merged

	errno

Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.

Instead, capture the return value, which is the real error value, 
and instead report that.


mysys/my_thr_init.c:
  pthread functions don't set the global errno, which should be
  obvious.

  Fixed branding problem.
Many files:
  Fixed branding problem
changelog:
  Upgraded to 5.0.42
defs.mk.in:
  Fixed branding and variable persiting problem.


debian/changelog:
  Upgraded to 5.0.42
debian/control.in:
  Fixed branding problem.
debian/defs.mk.in:
  Fixed branding and variable persiting problem.
debian/mysql-client-BASE.files.in:
  Fixed branding problem
debian/mysql-client-BASE.lintian-overrides.in:
  Fixed branding problem
debian/mysql-server-BASE.config.in:
  Fixed branding problem
debian/mysql-server-BASE.files.in:
  Fixed branding problem
debian/mysql-server-BASE.lintian-overrides.in:
  Fixed branding problem
debian/mysql-server-BASE.postinst.in:
  Fixed branding problem
debian/mysql-server-BASE.postrm.in:
  Fixed branding problem
debian/mysql-server-BASE.templates.in:
  Fixed branding problem
debian/rules:
  Fixed branding problem
debian/source.lintian-overrides.in:
  Fixed branding problem
debian/po/POTFILES.in.in:
  Fixed branding problem

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


client/mysql.cc:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge

  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE


mysql-test/r/innodb_mysql.result:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
mysql-test/t/innodb_mysql.test:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged

client/mysql_upgrade.c:
  Add defines for WEXITSTATUS
  Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
mysql-test/t/mysql_upgrade.test:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
scripts/comp_sql.c:
  Some compilers have a max string length, insert a newline at
  every 512th char in long strings

mysql-test/r/innodb.result:
  Move test result after incorrect merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

client/mysql_upgrade.c:
  Windows fix
scripts/CMakeLists.txt:
  Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
  Improve comp_sql.c to generate output file with shorter strings

into  mysql.com:/home/ram/work/b26851/b26851.5.0