into  mysql.com:/tmp/mysql-5.1-build

  Removed man page for "mysql_create_system_tables"


support-files/mysql.spec.sh:
  Removed man page for "mysql_create_system_tables"

mysql-test/suite/funcs_1/r/a_version_check.result:
  new version
mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc:
  read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc:
  read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc:
  read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result:
  read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result:
  read data from file.
mysql-test/suite/partitions/t/disabled.def:
  added not executable test program.
mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test:
  switched to long test.
mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test:
  switched to long test
BitKeeper/etc/ignore:
  Added mysql-test/suite/partitions/t/partition.test mysql-test/suite/partitions/r/dif mysql-test/suite/partitions/r/partition.result mysql-test/suite/partitions/r/partition_t55.out mysql-test/suite/partitions/r/partition_t55.refout to the ignore list
mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result:
  new result file.
mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test:
  ndb wrapper.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in:
  inpu file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in:
  input file
mysql-test/suite/partitions/r/partition_t55.out:
  reference fiel for output data to compare

into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build


BitKeeper/deleted/.del-SETUP.sh.rej:
  Auto merged
BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
BitKeeper/deleted/.del-my_global.h.rej:
  Auto merged
BitKeeper/deleted/.del-my_pthread.h.rej:
  Auto merged
BitKeeper/deleted/.del-thr_alarm.c.rej:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
zlib/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  SCCS merged

  Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"


configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
config/ac-macros/zlib.m4:
  Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
scripts/make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
zlib/Makefile.am:
  Always build the bundled zlib static only

into  mysql.com:/home/kent/bk/sotest/mysql-5.0-build

  configure.in.rej
  include/my_global.h.rej
  BUILD/SETUP.sh.rej
  mysys/thr_alarm.c.rej
  include/my_pthread.h.rej


BitKeeper/deleted/.del-SETUP.sh.rej:
  Delete: BUILD/SETUP.sh.rej
BitKeeper/deleted/.del-configure.in.rej:
  Delete: configure.in.rej
BitKeeper/deleted/.del-my_global.h.rej:
  Delete: include/my_global.h.rej
BitKeeper/deleted/.del-my_pthread.h.rej:
  Delete: include/my_pthread.h.rej
BitKeeper/deleted/.del-thr_alarm.c.rej:
  Delete: mysys/thr_alarm.c.rej

into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build

into  mysql.com:/home/kent/bk/sotest/mysql-5.0-build

mysql-test/r/information_schema.result:
  Fix a race in the test case (second attempt).
mysql-test/t/information_schema.test:
  Fix a race in the test case (second attempt).

mysql-test/r/information_schema.result:
  Fix a race (updated result file)
mysql-test/t/information_schema.test:
  Fix a race in a test.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-RPMs


BUILD/check-cpu:
  Auto merged
support-files/mysql.spec.sh:
  null merge

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs


support-files/mysql.spec.sh:
  don't call mtr explicitly

support-files/mysql.spec.sh:
  remove Max rpms and add a debug server

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_data_objects.h:
  Auto merged
sql/event_db_repository.h:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/events.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/events.result:
  Manual merge.
sql/event_db_repository.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  naruto.:C:/cpp/mysql-5.1-runtime


sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  manual merge

- Some variables in I_S.GLOBAL_STATUS were depending on a network
  connection in order to evaluate. Since no network connection is 
  present during the execution of an event, this caused the server
  to crash.
- The variable function hooks does now verify that the vio-
  object is valid before attempting to use it.


mysql-test/r/information_schema.result:
  Added test case.
mysql-test/t/information_schema.test:
  Added test case.

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/row.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl

new test case until the valgrind failure is fixed, 
reported in bug 27564)


mysql-test/t/disabled.def:
  New test case shows valgrind failre

mysql-test/t/rpl_row_create_table.test:
  Adding sync to allow slave to complete cleanup drop before resetting
  storage engine.

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt

conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities. 
 


mysql-test/r/row.result:
  Added a test case for bug #27154.
mysql-test/t/row.test:
  Added a test case for bug #27154.