into  mysql.com:/home/svoj/devel/mysql/BUG29806/mysql-5.1-engines


sql/ha_ndbcluster.cc:
  Auto merged
sql/lock.cc:
  Auto merged

Stopping mysql server could result in an entry in mysql error
file: "InnoDB: Error: MySQL is freeing a thd".

This happened because InnoDB assumes that the server will never
call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
failed.

Prior to this patch we haven't had strict definition whether
external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
fails.

This patch states that we never call external_lock(F_UNLCK) in case
external_lock(READ/WRITE) fails.


mysql-test/suite/binlog/t/disabled.def:
  Re-enabled binlog_innodb and binlog_killed tests.
sql/ha_ndbcluster.cc:
  Restore handler state in case external_lock() failed.
sql/ha_partition.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
sql/lock.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
storage/myisammrg/myrg_locking.c:
  Restore handler state in case external_lock() failed.

Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.0
into  pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.1

---
fix compile on Windows for bug25714.c


tests/bug25714.c:
  fix compile on Windows

Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.0
into  pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.1


BitKeeper/deleted/.del-CMakeLists.txt~5:
  Auto merged

Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.0
into  pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug25714.1.merge-5.1

into  xiphis.org:/anubis/antony/work/p2-bug25714.1.merge-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
tests/Makefile.am:
  Auto merged
storage/federated/ha_federated.cc:
  manual merge from 5.0 to 5.1

into  xiphis.org:/anubis/antony/work/p2-bug25714.1.merge-5.0

  "getGeneratedKeys() does not work with FEDERATED table"
  mysql_insert() expected the storage engine to update the row data
  during the write_row() operation with the value of the new auto-
  increment field. The field must be updated when only one row has
  been inserted as mysql_insert() would ignore the thd->last_insert.
  This patch implements HA_STATUS_AUTO support in ha_federated::info()
  and ensures that ha_federated::write_row() does update the row's
  auto-increment value.
  The test case was written in C as the protocol's 'id' value is
  accessible through libmysqlclient and not via SQL statements.
  mysql-test-run.pl was extended to enable running the test binary.


mysql-test/mysql-test-run.pl:
  bug25714
    implement support to run C test for bug25714
sql/ha_federated.cc:
  bug25714
    The storage engine instance property auto_increment_value was not
    being set.
    mysql_insert() requires that the storage engine updates the row with
    the auto-increment value, especially when only inserting one row.
    Implement support for ha_federated::info(HA_STATUS_AUTO)
tests/Makefile.am:
  bug25714
    build C test for bug
mysql-test/include/have_bug25714.inc:
  New BitKeeper file ``mysql-test/include/have_bug25714.inc''
mysql-test/r/federated_bug_25714.result:
  New BitKeeper file ``mysql-test/r/federated_bug_25714.result''
mysql-test/r/have_bug25714.require:
  New BitKeeper file ``mysql-test/r/have_bug25714.require''
mysql-test/t/federated_bug_25714.test:
  New BitKeeper file ``mysql-test/t/federated_bug_25714.test''
tests/bug25714.c:
  New BitKeeper file ``tests/bug25714.c''

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/sql_table.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/t/disabled.def:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


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

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged

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


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

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


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  xiphis.org:/anubis/antony/work/p1-bug29875.1


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

  "Disable transaction support in Federated storage engine"
  Minimal patch to disable Federated's transactions until they can be fixed.


mysql-test/r/federated.result:
  verify that transactions are disabled
mysql-test/t/disabled.def:
  bug29875
    disable federated_transactions test until Bug#29523 is resolved.
mysql-test/t/federated.test:
  verify that transactions are disabled
storage/federated/ha_federated.cc:
  bug29875
    Disable support for transactions until fixed.
storage/federated/ha_federated.h:
  bug29875
    Disable support for transactions until fixed.

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

into  trift-lap.none:/MySQL/M51/push-5.1

into  trift-lap.none:/MySQL/M50/push-5.0

into  trift-lap.none:/MySQL/M51/push-5.1

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


libmysql/libmysql.c:
  SCCS merged
sql/field.cc:
  SCCS merged
sql/field.h:
  SCCS merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  SCCS merged
configure.in:
  SCCS merged
scripts/make_binary_distribution.sh:
  SCCS merged

Fixed wrong test case. Added lost row that appeared after fix for
this bug.


mysql-test/r/alter_table.result:
  Fixed wrong test case. Added lost row that appeared after fix for
  BUG#28838 - duplicate external_lock in mysql_alter_table.

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


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG28838/mysql-5.1-engines


sql/sql_table.cc:
  Manual merge

into  mysql.com:/home/svoj/devel/mysql/BUG28838/mysql-5.0-engines

into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  SCCS merged
tests/mysql_client_test.c:
  SCCS merged

into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged