into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  Manual merge
sql/log.cc:
  Manual merge, spaces added to 5.1 version
sql/mysqld.cc:
  Code no longer exists
sql/set_var.cc:
  Manual merge

 - Part 2, add @@hostname system variable


mysql-test/r/variables.result:
  Add testcase for @@hostname
mysql-test/t/variables.test:
  Add testcase for @@hostname
sql/log.cc:
  Use pidfile_name as base when generating the default log name
sql/mysqld.cc:
  Init "glob_hostname" to that of hostname, fallback to "localhost"
  if 'gethostname' should fail.
  Init "pidfile_name" to hostname.pid and fallback to "mysql.pid" if
  'gethostname' should fail
sql/set_var.cc:
  Add new system variable "hostname"

into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged

 - Add test of bootstrap mode
 - Make mysqld return error if bootstrap failed  


mysql-test/mysql-test-run.pl:
  Remove options --skip-grant-tables as that is always
  turned on by --bootstrap
  Remove options --console as that does not affect --bootstrap mode
  at all
  Add environment variable MYSQLD_BOOTSTRAP_CMD containing path 
  to mysqld and the arguments used for bootstrap
sql/sql_parse.cc:
  Abort bootstrap if execution fails
  Report error to stderr/log
mysql-test/r/bootstrap.result:
  New BitKeeper file ``mysql-test/r/bootstrap.result''
mysql-test/t/bootstrap.test:
  New BitKeeper file ``mysql-test/t/bootstrap.test''

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


client/Makefile.am:
  Manual merge

mysql-test/mysql-test-run.pl:
  Allow both dash and underscore as separator for mysqld option

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

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


sql/share/errmsg.txt:
  Auto merged

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


sql/share/errmsg.txt:
  Auto merged

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


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

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


client/mysqltest.c:
  SCCS merged

mysql-test/r/mysqltest.result:
  Update result file after removing one test
mysql-test/t/mysqltest.test:
  Remove use of "ls" in system
  Rewrite "system echo" which introduces CR/LF problems
  with  "write_file"
  Remove test for end of line junk for "write_file" - it has mismatching number of "'s

know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"

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


mysql-test/t/mysql.test:
  Auto merged

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge with add of --debug-info

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


client/mysqltest.c:
  Auto merged

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


mysql-test/r/order_by.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  SCCS merged

mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." 


client/mysqltest.c:
  Workaround the problem with "echo" in windows not behaving like "echo" in Unix.
  - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing
    use of our own echo implementation which baheves like on Unix.
  - The above change makes it possible to remove the need to execute all --exec's
    inside cygwin. Add ifdefs to only use use cygwin's bash conditionally
mysql-test/lib/mtr_misc.pl:
  Add function for converting to the OS's native format
mysql-test/mysql-test-run.pl:
  Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode
  necessary for pipes and redirects to work properly in cmd.exe
client/echo.c:
  New BitKeeper file ``client/echo.c''

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


sql/mysql_priv.h:
  Auto merged

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

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


sql/Makefile.am:
  Auto merged

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


sql/Makefile.am:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777


sql/Makefile.am:
  SCCS merged

into  neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777


sql/Makefile.am:
  Auto merged

uses the same format specifiers

into  pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


extra/comp_err.c:
  Auto merged
sql/share/errmsg.txt:
  Dont merge errmsg.txt

Update error message text accordingly to be equal between all translations


extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks

into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint


sql/item.cc:
  Auto merged
mysql-test/r/order_by.result:
  Manual merge.
mysql-test/t/order_by.test:
  Manual merge.

into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint

into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged