into  mysql.com:/home/bk/b16228-mysql-5.1-new


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

  Transaction aborted on slave should be retries. The OPTION_BEGIN
  bit was cleared prematurely. Removed dependence of code on value
  of OPTION_BEGIN bit when executing retries.


mysql-test/r/rpl_ndb_basic.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test.
mysql-test/t/rpl_ndb_basic.test:
  Changing test to allow checking that slave did not stop.
sql/slave.cc:
  Rolling back transaction before retrying it.
  Only resetting transaction retries counter on a successful execution
  or a non-transitional error.

into  mysql.com:/home/bk/fix-mysql-5.1-new

  Some storage engines does not set the filler bits, so we set them
  before calling the record-reading functions.


sql/log_event.cc:
  Set the null byte containing filler bits before calling any record-
  reading functions.

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new

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

mysql-test/r/rpl_row_create_table.result:
  Update test results for "rpl_row_create_table" after push of fix for bug10460

mysql-test/r/rpl_row_UUID.result:
  Update test result for "rpl_row_UUID" after push of fix for bug10460

mysql-test/r/lowercase_table2.result:
  Update test result for "lowercase_tabe2" after push of fix for bug10460

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge. (use local)

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

 -liboptions.a -> liboptions.la


server-tools/instance-manager/Makefile.am:
  Link with liboptions.la

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

into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new

  Change comment for fast-mutex


configure.in:
  Change comment for fast-mutex

into  mysql.com:/space/pekka/ndb/version/my51

  Change default value --with-fast-mutexes=no


configure.in:
  Change default value --with-fast-mutexes=no

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


mysql-test/r/binary.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged

mysql-test/t/disabled.def:
  close non-bug rpl_ndb_charset Bug#17246

mysql-test/r/binary.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
support-files/mysql.spec.sh:
  Embedded is to be enabled in 5.1

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/space/pekka/ndb/version/my51-dict

 - Fix result files


mysql-test/r/ndb_dd_backuprestore.result:
  Changes "auto_increment" to uppercase

into mysql.com:/home/gluh/MySQL/Merge/5.0

into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged

into mysql.com:/home/gluh/MySQL/Merge/5.0

into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377

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


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

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


mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_02myisam.result:
  Auto merged
mysql-test/r/partition_mgm_err.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/archive_gis.result:
  Merge bug10460
mysql-test/r/bdb_gis.result:
  Merge bug10460
mysql-test/r/func_system.result:
  Merge bug10460
mysql-test/r/innodb_gis.result:
  Merge bug10460
mysql-test/r/ndb_gis.result:
  Merge bug10460

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

mysql-test/t/grant.test:
  Auto merged
mysql-test/r/grant.result:
  manual merge
sql/sql_acl.cc:
  manual merge

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new