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


mysql-test/t/archive.test:
  Auto merged
mysql-test/r/archive.result:
  Use local.
storage/archive/ha_archive.cc:
  Manual merge.

CHECK TABLE against ARCHIVE table may falsely report table corruption,
or cause server crash.

Fixed by using proper buffer for CHECK TABLE.

Affects both 5.0 and 5.1.


mysql-test/r/archive.result:
  A test case for BUG#28916.
mysql-test/t/archive.test:
  A test case for BUG#28916.
sql/ha_archive.cc:
  We call Field::get_length() from get_row(). Field::get_length() assumes
  that the row was read into table->record[0] buffer, which is not the
  case when we check a table. As a result we get wrongly initialized
  blob length.
  
  Use table->record[0] as record buffer for check table instead.

Assertion failure may happen with falcon + partition + select for
update. This may affect other engines as well.

Though assertion failure is fixed with this patch, falcon still
deadlocks when running falcon_bug_28026.test.


sql/ha_partition.cc:
  In case rnd_next fails, we must call ha_rnd_end. This is done
  conditionally (NO_CURRENT_PART_ID != m_part_spec.start_part)
  in ha_partition::ha_rnd_end. Thus we may not reset
  m_part_spec.start_part in case rnd is not ended.

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


storage/archive/ha_archive.cc:
  Use local.

Max compressed file size was calculated incorretly causing server
crash on INSERT.

With this patch we use proper max file size provided by zlib.

Affects 5.0 only.


sql/ha_archive.cc:
  When calculating max compressed file size, use the real offset size
  that is provided by zlib, instead of sizeof(z_off_t), which may be
  different from actual offset size.
  
  When we're about to write and the data file is almost full flush gzio
  buffer to get accurate real file size.
mysql-test/r/archive-big.result:
  New BitKeeper file ``mysql-test/r/archive-big.result''
mysql-test/t/archive-big.test:
  New BitKeeper file ``mysql-test/t/archive-big.test''

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


mysql-test/r/csv.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged

  Ignore warning about file name
  having question marks.


mysql-test/lib/mtr_report.pl:
  Ignore warning about file name
  having question marks.

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

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


configure.in:
  Auto merged

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

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

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


configure.in:
  Auto merged

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/r/ndb_restore.result:
  null merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


sql/handler.h:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines


sql/handler.h:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

- do not print 701 dictionary busy error


sql/ha_ndbcluster.cc:
  save the ndb error such that it can be traced
sql/ha_ndbcluster.h:
  save the ndb error such that it can be traced
sql/ha_ndbcluster_binlog.cc:
  use the traced ndb error to determine if it is an error that should be printed

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/r/ndb_restore.result:
  null merge
mysql-test/t/ndb_restore.test:
  null merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines

- correct test and result file

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines

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


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

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

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


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

- handler binlog's must be shutdoem before logger.cleanup_base

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  merge fix

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


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

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


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