Checking for NULL before calling the val_xxx()
 methods only checks for such arguments that are 
 known to be NULLs at compile time. 
 The arguments that may or may not contain
 NULLs (e.g. function calls and possibly others)
 are not checked at all.
 Fixed by first calling the val_xxx() method and
 then checking for null in SEC_TO_TIME().
 In addition QUARTER() was not returning 0 (as all the 
 val_int() functions do when processing a NULL value).

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

Fixed typo problem that surfaced after the merge

identical pushed_cond_guards arrays. Allocate only one always.

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

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

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

- post review changes

The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.  
Merged the test case for bug 14708 from 5.0.

  Code cleanup after fix for bug#23417.

  Post fix for bug#25123.

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

When inserting into a join-based view the update fields from the ON DUPLICATE
KEY UPDATE wasn't checked to be from the table being inserted into and were
silently ignored.

The new check_view_single_update() function is added to check that
insert/update fields are being from the same single table of the view.

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

into  moonbone.local:/work/25172-bug-5.0-opt-mysql

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

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

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

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

After fix for bug#21798 JOIN stores the pointer to the buffer for sorting
fields. It is used while sorting for grouping and for ordering. If ORDER BY
clause has more elements then the GROUP BY clause then a memory overrun occurs.

Now the length of the ORDER BY list is always passed to the 
make_unireg_sortorder() function and it allocates buffer big enough to be
used for bigger list.

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

UNION over correlated and uncorrelated SELECTS.
In such subqueries each uncorrelated SELECT should be considered as
uncacheable. Otherwise join_free is called for it and in many cases
it causes some problems.

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

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