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

  fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY

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

Submitting patch on Guilhem's behalf (he found the solution).
  
Correcting a typo that caused very big increases in memory usage when
more memory needed to be allocated for row-based events. Also correcting
a border case check when more memory needed to be allocated.

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.1-merge

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

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

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.

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

Post-merge fixes.

  "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).

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

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

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

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

  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

into  trift2.:/MySQL/M51/merge-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

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

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

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

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".

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

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

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