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

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

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

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

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.

  
  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

- post review changes

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

Do not propagate this change into main trees.

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

tables' lock."

Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
long time) prevented concurrent execution of all statements using tables.

The problem was caused by the fact that we were holding LOCK_open mutex
during whole duration of this statement and particularly during call
to handler::enable_indexes(). This behavior was introduced as part of the
fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
too late (race cond)"

The patch simply restores old behavior. Note that we can safely do this as
this operation takes exclusive lock (similar to name-lock) which blocks both
DML and DDL on the table being altered.

It also introduces mysql-test/include/wait_show_pattern.inc helper script
which is used to make test-case for this bug robust enough.

into  recycle.(none):/src/mysql-5.0-maint

- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

 - Additional patch removing check for mysql_errno on already closed
   mysql1

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533

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

  fix cpu peak in big clusters during unpack of config

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge

WL#3681 (ALTER TABLE ORDER BY)

Before this fix, the ALTER TABLE statement implemented an ORDER BY option
with the following characteristics :

1) The order by clause accepts a list of criteria, with optional ASC or
DESC keywords

2) Each criteria can be a general expression, involving operators,
native functions, stored functions, user defined functions, subselects ...

With this fix :

1) has been left unchanged, since it's a de-facto existing feature,
that was already present in the code base and partially covered in the test
suite. Code coverage for ASC and DESC was missing and has been improved.

2) has been changed to limit the kind of criteria that are permissible:
now only a column name is valid.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  recycle.(none):/src/mysql-5.0-maint

- Create space safe strings for system() calls in mysql_upgrade.exe