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

into  xp.:C:/work/mysql-5.1-new-maint


sql-common/client.c:
  Auto merged

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.1-new-maint

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


mysql-test/t/backup.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

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  mysql.com:/home/ram/work/b28806/b28806.5.1

Problem: getting an autoincrement value for a partition table in the ::info() method we call
the get_auto_increment() for all partitions. That may cause a problem for at least MyISAM
tables that rely on some table state (in this particular case table->naxt_nuber_field is 
set to 0 in the mysql_insert() and we get a crash). 
Moreover, calling get_auto_increment() is superfluous there.

Fix: use ::info(HA_STATUS_AUTO) calls to get autoincrement values for partitions instead of
get_auto_increment() ones in the ha_partition::info().


mysql-test/r/partition.result:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - test result.
mysql-test/t/partition.test:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - test case.
sql/ha_partition.cc:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - use info(HA_STATUS_AUTO) calls to get autoincrement values for partitions,
      set the auto_increment_value as the biggest one.

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

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

This is to fix PB failures introduced by the patch for bug #28895.


mysql-test/r/view_grant.result:
  Fixed tests that relied on broken behavior in acl_getroot_no_password().

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

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

into  pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690


mysys/my_thr_init.c:
  Merge 5.0->5.1

 - 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.1-new-maint


configure.in:
  Auto merged
sql/sql_acl.cc:
  Auto merged

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  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/sql_acl.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895


mysql-test/r/view_grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

  Add another exception to the acceptable mysqld errors, for test case for bug 28436


mysql-test/lib/mtr_report.pl:
  Add another exception to the acceptable mysqld errors, for test case for bug 28436

  Post-merge fix warning


strings/ctype-bin.c:
  Post-merge fix warning

  Post-merge fix (byte -> uchar)


sql/sql_prepare.cc:
  Post-merge fix (byte -> uchar)

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


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/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  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


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/51


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  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/51


client/mysqldump.c:
  Auto merged
include/m_string.h:
  Auto merged
include/mysql_com.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_init.c:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/strtod.c:
  Auto merged
vio/vio_priv.h:
  Auto merged
vio/viosocket.c:
  Auto merged
client/mysqltest.c:
  SCCS merged
include/my_global.h:
  SCCS merged
sql/field.h:
  SCCS merged
sql/sql_table.cc:
  Manual merge
strings/ctype-bin.c:
  Manual merge

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/my51-bug24400

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


BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged

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