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

into  mysql.com:/home/gluh/MySQL/Merge/5.0

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

into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12

Fixed typo problem that surfaced after the merge

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

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

identical pushed_cond_guards arrays. Allocate only one always.

the team tree for additional investigation.

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

into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

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

After merge fix

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

Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.

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

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

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

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines

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

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

into  olga.mysql.com:/home/igor/mysql-5.0-opt

into  chilla.local:/home/mydev/mysql-4.1-bug24607

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

into  olga.mysql.com:/home/igor/mysql-5.0-opt

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

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

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

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

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  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

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

    Fix bug in event handling wrt early node shutdown