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

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

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

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.

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

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

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

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

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

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

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25382-5.0-opt

 crashes server
 Check for null value is reliable only after calling some of the 
 val_xxx() methods. If the val_xxx() method is not called
 the null_value flag will be set only for certain types of NULL
 values (like SQL constant NULLs for example).
 This caused a crash while trying to dereference a NULL pointer
 that is returned by val_str() for NULL values.
 Fixed by swapping the order of val_xxx() and null_value check.