into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge

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

table in insert ... on duplicate key" in 5.1 tree.

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work

into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build

into  xiphis.org:/home/antony/work2/p1-bug25396.5

into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb

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

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567

  "Valgrind leak in closecon_handlerton"
  plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
  ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
  the handlerton struct being freed before the ndb utility thread has destroyed it's THD
  but before the plugin has been marked as UNINITIALIZED

Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.

into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491

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

on duplicate key".

INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
stored routine or as prepared statement and which in its ON DUPLICATE
KEY clause erroneously tried to assign value to a column mentioned only
in its SELECT part was properly emitting error on the first execution
but succeeded on the second and following executions.

Code which is responsible for name resolution of fields mentioned in
UPDATE clause (e.g. see select_insert::prepare()) modifies table list
and Name_resolution_context used in this process. It uses
Name_resolution_context_state::save_state/restore_state() to revert
these modifications. Unfortunately those two methods failed to revert
properly modifications to TABLE_LIST::next_name_resolution_table
and this broke name resolution process for successive executions.

This patch fixes Name_resolution_context_state::save_state/restore_state()
in such way that it properly handles TABLE_LIST::next_name_resolution_table.

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

  
  aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).

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

    Fix bug in event handling wrt early node shutdown

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

- post review changes

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

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

- make sure keys are copied correctly when varchar has 2 length bytes
- test case

Do not propagate this change into main trees.

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

Do not propagate this change into main trees!

  remove accidently left debug prinouts

  Make sure subscriber is removed from list when n_subscribers is decreased

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

  Fix assertion in corner-case where signal isnt sent to any node

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

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