into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521

 Fixed BUG#19366: "consistent_snapshot.test fails".

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.

 Fixed BUG#19366: "consistent_snapshot.test fails".

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667

our sprintf()-alike in sync with our fprintf()-alike features.

into  mysql.com:/home/dlenev/mysql-5.0-bg11081

into mysql.com:/home/hf/work/mysql-5.0.clean

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667

Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/home/jimw/my/mysql-5.0-clean

  Use "./libtool --mode=execute" to find real path to executables

into mysql.com:/home/hf/work/mysql-5.0.clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  Fix strange "double" define for popen.
  Avoid warnings about sprintf() etc. being unsafe.
  Corrected typo "#endfif"

  Changed version to 4.1.20

  Backport of changes in 5.0 (bug#18294)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Include and run mysql_upgrade if needed (bug#19353)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0

into  devsrv-b.mysql.com:/users/msvensson/mysql-4.1

 - Eval shrext_cmds variable before using it
 - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  devsrv-b.mysql.com:/users/msvensson/mysql-4.1

into  lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-5.0-B18492

In the code that converts IN predicates to EXISTS predicates it is changing
the select list elements to constant 1. Example :
SELECT ... FROM ...  WHERE a IN (SELECT c FROM ...)
is transformed to :
SELECT ... FROM ... WHERE EXISTS (SELECT 1 FROM ...  HAVING a = c)
However there can be no FROM clause in the IN subquery and it may not be
a simple select : SELECT ... FROM ... WHERE a IN (SELECT f(..) AS
c UNION SELECT ...) This query is transformed to : SELECT ... FROM ...
WHERE EXISTS (SELECT 1 FROM (SELECT f(..) AS c UNION SELECT ...)
x HAVING a = c) In the above query c in the HAVING clause is made to be
an Item_null_helper (a subclass of Item_ref) pointing to the real
Item_field (which is not referenced anywhere else in the query anymore).
This is done because Item_ref_null_helper collects information whether
there are NULL values in the result.  This is OK for directly executed
statements, because the Item_field pointed by the Item_null_helper is
already fixed when the transformation is done.  But when executed as
a prepared statement all the Item instances are "un-fixed" before the
recompilation of the prepared statement. So when the Item_null_helper
gets fixed it discovers that the Item_field it points to is not fixed
and issues an error.  The remedy is to keep the original select list
references when there are no tables in the FROM clause. So the above
becomes : SELECT ... FROM ...  WHERE EXISTS (SELECT c FROM (SELECT f(..)
AS c UNION SELECT ...) x HAVING a = c) In this way c is referenced
directly in the select list as well as by reference in the HAVING
clause. So it gets correctly fixed even with prepared statements.  And
since the Item_null_helper subclass of Item_ref_null_helper is not used
anywhere else it's taken out.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0