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


scripts/mysql_fix_privilege_tables.sql.in:
  Manual merge
scripts/mysql_system_tables.sql:
  Manual merge

 - Escape undercore character in mysql.db to only allow
  access test_% and not test%


scripts/mysql_system_tables.sql:
  underscore is a wildcard character so it need to be
  expaed to only match one _

 - Updates for 5.1


mysql-test/t/lock_multi.test:
  Test need anonymous users
mysql-test/t/rpl_temporary.test:
  Test need anonymous users
scripts/mysql_system_tables.sql:
  Update mysql_system_tables.sql for 5.1

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
mysql-test/r/mysql_upgrade.result:
  SCCS merged
mysql-test/t/lock_multi.test:
  Use local
mysql-test/t/rpl_temporary.test:
  Use local
mysql-test/Makefile.am:
  Manual merge
scripts/mysql_fix_privilege_tables.sh:
  Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
  Manual merge
scripts/mysql_install_db.sh:
  Manual merge

 - Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)


BitKeeper/deleted/.del-init_db.sql:
  Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh
BitKeeper/etc/ignore:
  Added scripts/mysql_fix_privilege_tables.sql to the ignore list
mysql-test/Makefile.am:
  lib/init_db.sql has been removed
mysql-test/mysql-test-run.pl:
  - Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
  mysql_test_data_timezone.sql and fill_help_tables.sql and use
  it when bootsraping the system tables to use during test.
mysql-test/r/create.result:
  Update result file
mysql-test/r/derived.result:
  Update result file
mysql-test/r/join.result:
  Update result file
mysql-test/r/mysql_upgrade.result:
  Update result file
mysql-test/r/sp-security.result:
  Update result file
mysql-test/t/create.test:
  Add user mysqltest_1 before trying to connect as that user - no
  anon users by default anymore
mysql-test/t/derived.test:
  Add user mysqltest_1 before trying to connect as that user - no
  anon users by default anymore
mysql-test/t/grant2.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/grant_cache.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/init_connect.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/lock_multi.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/ndb_basic.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/ndb_index_ordered.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/ndb_multi.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/overflow.test:
  Connect as root - no anonymous users by default anymore
mysql-test/t/rpl_temporary.test:
  Add anonymous users for the test
mysql-test/t/xa.test:
  Connect as "root", blank user wil pick currently logged in user
scripts/Makefile.am:
  Remove mysql_create_system_tables.sh
  Add mysql_system_tables.sql and mysql_test_data_timezone.sql
  Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
  and mysql_fix_privilege_tables.sql.in
scripts/mysql_fix_privilege_tables.sh:
  Update message describing what the script does
scripts/mysql_fix_privilege_tables.sql.in:
  Remove the part that creates system tables as that will be added to
  mysql_fix_privileg_tables.sql from mysql_system_tables.sql
  Change all comments to use #
scripts/mysql_install_db.sh:
  Use mysql_system_tables.sql to create the MySQL system tables
  Update comments and indentation
  Add more descriptive comments about --windows switch
  Reduce number of hardcoded names for the SQL files the script
  looks for
mysql-test/include/add_anonymous_users.inc:
  New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''
mysql-test/include/delete_anonymous_users.inc:
  New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''
scripts/mysql_system_tables.sql:
  New BitKeeper file ``scripts/mysql_system_tables.sql''
scripts/mysql_test_data_timezone.sql:
  New BitKeeper file ``scripts/mysql_test_data_timezone.sql''

 - Fixes for 5.1


sql/log.cc:
  Use "pidfile_name" instead of "glob_hostname" as base for
  log file name
sql/mysqld.cc:
  Use "pidfile_name" instead of "glob_hostname" as base for
  log file name

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