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


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Increase suite timeout even more when running with  valgrind

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


mysql-test/mysql-test-run.pl:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.

mysql-test/lib/mtr_stress.pl:
  Remove duplicate definition of variable
mysql-test/mysql-test-run.pl:
  Fix spelling error
  Fix warning about uninitialised warning

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


extra/Makefile.am:
  Auto merged

 - Remove the wildcard dependcy on the charset xml files


extra/Makefile.am:
  Remove the "wildcard" dependency

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


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged

 - Make built sources only depend on it's sources not the built tool


extra/Makefile.am:
  The files built by "comp_err" should only depend on their sources not the tool comp_err
  The built sources should only be cleaned by "make distclean"
sql/Makefile.am:
  The built file "lex_hash.h" should depend on it's sources

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

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


mysql-test/mysql-test-run.pl:
  Auto merged

installed charset dir being used.


mysql-test/mysql-test-run.pl:
  Add character-sets-dir argument to "mysql". That avoids a local
  installed charset dir being used.

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


zlib/Makefile.am:
  Auto merged

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

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

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/work/my50-work

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.0-maint

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

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


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.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

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

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


vio/viosocket.c:
  Auto merged

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

into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca

Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option


client/mysql_upgrade.c:
  The "password" option should be issued after group header to upgrade_defaults file whenever it is used

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint