- Backport include/show_binlog_events.inc from 5.1 and use it to make
the test output consistent results


mysql-test/r/mix_innodb_myisam_binlog.result:
  Backport include/show_binlog_events.inc from 5.1 and use it to make
  the test output consistent results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Backport include/show_binlog_events.inc from 5.1 and use it to make
  the test output consistent results
mysql-test/include/show_binlog_events.inc:
  New BitKeeper file ``mysql-test/include/show_binlog_events.inc''

mysql-test/lib/mtr_cases.pl:
  Don't turn off binlog in versions prior to 5.0
mysql-test/r/binlog.result:
  Update result after adding "one more select"
mysql-test/t/binlog.test:
  Update result after adding "one more select"

 - Fix test to work on OS where backslashes are forward


mysql-test/include/uses_vardir.inc:
  Make the test work on windows too

BitKeeper/deleted/.del-is_debug_build.inc:
  Rename: mysql-test/include/is_debug_build.inc -> BitKeeper/deleted/.del-is_debug_build.inc

Mark one more test as needing binlog


mysql-test/include/master-slave.inc:
  Fix typo
mysql-test/lib/mtr_cases.pl:
  Fix typo
mysql-test/r/have_log_bin.require:
  Fix typo
mysql-test/t/binlog_killed.test:
  Need binlog

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


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

 - Turn on binlog only for tests that need it
 - Skip those tests if --skip-binlog is used


BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
  Rename: mysql-test/r/ctype_cp932_notembedded.result -> BitKeeper/deleted/.del-ctype_cp932_notembedded.result
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Rename: mysql-test/t/ctype_cp932_notembedded.test -> BitKeeper/deleted/.del-ctype_cp932_notembedded.test
mysql-test/include/master-slave.inc:
  Need binlog
mysql-test/lib/mtr_cases.pl:
  Turn on binlog only for tests that need it
  Skip those tests if --skip-binlog is used
mysql-test/r/sp_trans.result:
  Moved to "sp_binlog"
mysql-test/t/binlog.test:
  Need binlog
mysql-test/t/blackhole.test:
  Need binlog
mysql-test/t/ctype_cp932_binlog.test:
  Need binlog
mysql-test/t/ctype_ucs_binlog.test:
  Need binlog
mysql-test/t/drop_temp_table.test:
  Need binlog
mysql-test/t/flush_block_commit_notembedded.test:
  Need binlog
mysql-test/t/innodb.test:
  Need binlog
mysql-test/t/insert_select-binlog.test:
  Need binlog
mysql-test/t/mix_innodb_myisam_binlog.test:
  Need binlog
mysql-test/t/mysqlbinlog-cp932.test:
  Need binlog
mysql-test/t/mysqlbinlog.test:
  Need binlog
mysql-test/t/mysqlbinlog2.test:
  Need binlog
mysql-test/t/mysqldump.test:
  Need binlog
mysql-test/t/rpl000015.test:
  Need binlog
mysql-test/t/rpl000017.test:
  Need binlog
mysql-test/t/rpl_rotate_logs.test:
  Need binlog
mysql-test/t/sp_trans.test:
  Moved to "sp_binlog"
mysql-test/t/user_var-binlog.test:
  Need binlog
mysql-test/r/sp_trans_log.result:
  New BitKeeper file ``mysql-test/r/sp_trans_log.result''
mysql-test/t/sp_trans_log.test:
  New BitKeeper file ``mysql-test/t/sp_trans_log.test''

BitKeeper/triggers/pre-commit:
  Turn off EOLN_NATIVE flag

into  xp.:C:/work/mysql-5.0-maint

The events were not being opened in the global namespace.


sql-common/client.c:
  Add Global\\ to the event names so they are opened in the global namespace

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

 - Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR


mysql-test/t/backup.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/t/blackhole.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/include/uses_vardir.inc:
  New BitKeeper file ``mysql-test/include/uses_vardir.inc''

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

 - Only use the "hack for bug in NTPL" if using NTPL, by dynamically
   checking the thd_lib_detected flag


mysys/my_thr_init.c:
  Only start the "dummy thread hack for bug in NPTL" - if using NPTL.
  If the system uses LinuxThreads it's not needed, it actually causes 
  the "pthread manager" to be started as root and thus all subsequent
  threads will also run as root although mysqld drops root privileges, 
  this in turns causes mysqld to deadlock since the mysqlds main thread
  running as <user> can't send signals to a process owned by root.

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/sql_acl.cc:
  Auto merged

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


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.


mysql-test/r/view_grant.result:
  Fixed the testcase for bug #14875 which relied on broken behavior. sctx->master_access and sctx->priv_user were being set to the last entry in the acl_users list. That does not happen after the patch for bug #28895, so we get a different warning message.
sql/sql_acl.cc:
  In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  amd64.(none):/src/bug24400/my41-bug24400

into  amd64.(none):/src/bug24400/my50-bug24400

into  amd64.(none):/src/bug24400/my50-bug24400


VC++Files/sql/mysqld.dsp:
  Auto merged

 - Declare 'tgoto' if not already declared in system header files. 


cmd-line-utils/libedit/el_term.h:
  Declare 'tgoto' if not already declared in system header files. Failing
  to declare it will cause the pointer returned to be truncated
  to 32-bit integer which is no a valid pointer - in most cases.
configure.in:
  Add check to see if 'tgoto' is declared in system header files

into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741


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

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728

into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

  Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.


mysql-test/r/user_var.result:
  Corrected test case result for the bug#28494.
sql/item_func.h:
  Corrected function names after fix for the bug#28494.
sql/item_func.cc:
  Corrected function names after fix for the bug#28494.

into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

  Extended test case for the bug#28494.


mysql-test/t/user_var.test:
  Extended test case for the bug#28494.
mysql-test/r/user_var.result:
  Extended test case for the bug#28494.

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728

into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a 
trigger.


include/thr_lock.h:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time
mysql-test/r/trigger.result:
  Bug #26162: test case
mysql-test/t/trigger.test:
  Bug #26162: test case
sql/set_var.cc:
  Bug #26162: fixed the handling of the "low-priority-updates" option
sql/sql_base.cc:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time
sql/sql_yacc.yy:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time

into  amd64.(none):/src/bug24732/my50-bug24732

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728

into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql