fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY


mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
  fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY

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


sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

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


sql/item_func.cc:
  Auto merged

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


client/mysqlbinlog.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
sql/log.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge

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


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

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


sql/item_func.cc:
  Auto merged

mysqlbinlog prints all row-based events of a single statement as a
single "BINLOG" statement containing the concatenation of those events.
Big (i.e. >64k) concatenations of row-based events
(e.g. Write_rows_log_event) caused mysqlbinlog's IO_CACHE to overflow
to a temporary file but the IO_CACHE had not been inited with
open_cached_file(), so it tried to create a temporary file in
an uninitialized directory (thus failing to create, then to write;
some OS errors were printed, and it finally segfaulted).
After fixing this, it appeared that mysqlbinlog was printing only
a piece of big concatenations of row-based events (it printed
at most the size of the IO_CACHE's buffer i.e. 64k); that caused data
loss at restore. We fix and test that.
Last, mysqlbinlog's printouts looked a bit strange with the informative
header (#-prefixed) of groupped Rows_log_event all on one line,
so we insert \n. After that, a small bug in the --hexdump code appeared
(only if the string to hex-print had its length a multiple of 16),
we fix it.



client/mysqlbinlog.cc:
  if we write to IO_CACHE more than can fit into its memory buffer,
  it will try to overflow into a file; for that to work, IO_CACHE
  must be inited via open_cached_file().
mysql-test/r/mysqlbinlog_base64.result:
  result update
mysql-test/t/mysqlbinlog_base64.test:
  test for BUG#25628: test that mysqlbinlog does not have OS errors
  with big concatenations of row-based events
  (e.g. Write_rows_log_event), and prints those concatenations entirely
  (testing by piping the output back into the server and comparing data).
mysys/mf_iocache2.c:
  my_b_copy_to_file() had a problem: it assumed that bytes_in_cache
  are all the bytes to copy to the file, while it only tells how many
  bytes are in the buffer; so the code forgot to copy what had already
  overflown into a temporary file. Thus any big event was printed only
  partially by mysqlbinlog (loss of data at restore). The fix is
  inspired by MYSQL_BIN_LOG::write_cache().
sql/log_event.cc:
  Several Table_map/Write_rows events generated by one single statement
  get groupped together in mysqlbinlog's output; it printed things like
  #718 7:30:51 server id 12 end_log_pos 988      Write_rows: table id 17#718 7:30:51 server id 12 #718 7:30:51 server id 12  end_log_pos 988      Write_rows: table id 17#718 7:30:51 server id 12 end_log_pos 1413 <cut>
  It didn't look nice to have printouts glued like this without line
  breaks. Adding a line break.
  Doing this, when using --hexdump the result was:
  #718 7:30:51 server id 12 end_log_pos 988
  # <hexdump output>
  # Write_rows: table id 17
  which is correct; unfortunately if the hex dump had only full lines
  (i.e the string to print in hex had its length a multiple of 16),
  then the # in front of Write_rows was not printed. Fixed.
sql/log_event.h:
  removing strcpy() (one less function call).
  If we write to IO_CACHE more than can fit into its memory buffer,
  it will try to overflow into a file; for that to work, IO_CACHE
  must be inited via open_cached_file().
  open_cached_file(), like init_io_cache(), can fail; we make sure to
  catch this constructor's problem via the init_ok() method.

into  dl145h.mysql.com:/users/gbichot/mysql-5.1-rpl


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

Post-merge fixes.


include/my_global.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
sql/slave.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
storage/ndb/include/ndb_global.h.in:
  Removing local definition of placement versions of
  operator new and operator delete.

  "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
didn't make it into 5.0.36 and 5.1.16,
so we need to adjust the bug-detection-based-on-version-number code.
Because the rpl tree has a too old version, rpl_insert_id cannot pass,
so I disable it (like is already the case in 5.1-rpl for the same reason),
and the repl team will re-enable it when they merge 5.0 and 5.1 into
their trees (thus getting the right version number).


mysql-test/t/disabled.def:
      rpl_insert_id tests statement-based replication of INSERT ON
      DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
      fixed in 5.0.38; we made the slave detect if it is connected to a
      <5.0.38 master and if so refuse to replicate.
      The problem is that this 5.0-rpl tree, even though it will produce
      the 5.0.38 release, still has a 5.0.36 version in configure.in.
      Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
      tree gets the changesets from the main 5.0, its version will change
      to 5.0.38 and so the repl team will re-enable the test.
sql/slave.cc:
  the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
  so we need to adjust the bug-detection-based-on-version-number code.

into  romeo.(none):/home/bk/b19033-mysql-5.1-new-rpl


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1

  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol


storage/archive/archive_reader.c:
  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol

into  poseidon.mysql.com:/home/tomas/mysql-5.1

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


configure.in:
  Auto merged

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


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Null-merge: 5.0 version number upgrade only, irrelevant for 5.1

Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

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

- fixed error code
- added test program run in mysql-test-run bk version


mysql-test/ndb/ndbcluster.sh:
  Bug #26490 duplicate cluster error code
  - added check for duplicate error in mysql-test run
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/Makefile.am:
  Bug #26490 duplicate cluster error code
  - added test program for duplicate error messages
storage/ndb/src/ndbapi/ndberror.c:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/ndberror_check.c:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''

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


configure.in:
  Auto merged

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


configure.in:
  nullmerge

into  trift2.:/MySQL/M50/merge-5.0


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

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

The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".


mysys/thr_alarm.c:
  After-merge fix:
  In 4.1, the variable "thr_client_alarm" is declared in this module.

into  trift2.:/MySQL/M41/merge-4.1


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Not applicable to 4.1 in its current state.
sql/mysqld.cc:
  Change was a backport already, null-merged to 4.1.

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


mysys/my_thr_init.c:
  Auto merged

storage/ndb/include/ndbapi/NdbOperation.hpp:
  Add some comments describing the new AbortOption handling.
storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp:
  Fix example to work with new AbortOption handling.
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Add forgotten method implementations.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/daily-basic-tests.txt:
  merge