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

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


config/ac-macros/openssl.m4:
  Move from acinclude.m4
config/ac-macros/zlib.m4:
  Move from acinclude.m4

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


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Changes to acinclude.m4 will go into openssl.m4 and zlib.m4

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


mysql-test/r/subselect.result:
  merged
sql/item.cc:
  merged
sql/item.h:
  merged
sql/item_subselect.cc:
  merged

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.


mysql-test/r/ps_11bugs.result:
  Test case for the bug
mysql-test/r/subselect.result:
  Explain updated because of the tranformation
mysql-test/t/ps_11bugs.test:
  Testcase for the bug
sql/item.cc:
  Taking out Item_null_helper as it's no longer needed
sql/item.h:
  Taking out Item_null_helper as it's no longer needed
sql/item_subselect.cc:
  The described change to the IN->EXISTS transformation

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

pushed in 5.0


VC++Files/mysql.dsw:
  mysql_upgrade tool added
VC++Files/mysql.sln:
  mysql_upgrade tool added
VC++Files/mysql_ia64.dsw:
  mysql_upgrade tool added
client/Makefile.am:
  mysql_upgrade tool added

into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Auto merged

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

extra/yassl/src/yassl_int.cpp:
  Fix merge error, missing {
extra/yassl/taocrypt/src/integer.cpp:
  Fix merge error, duplicate function definition

Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example


mysql-test/lib/mtr_misc.pl:
  Return empty string if file does not exist
mysql-test/mysql-test-run.pl:
  Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable

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

  Supplying --skip-rpl to mysql-test-run.pl would always disable the
  slaves, but those slaves may still be needed for the federated tests.
  Now we only disable the slaves when they are not used by any of the
  tests.


mysql-test/mysql-test-run.pl:
  Decide whether to set up and start slave databases based entirely on
  which tests are used, and don't allow --skip-rpl to ruin the party,
  since other tests than replication rely on the slaves (namely federated).

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


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/openssl/rsa.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/include/yassl_types.hpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/taocrypt/include/integer.hpp:
  Auto merged
extra/yassl/taocrypt/include/misc.hpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/src/template_instnt.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Manual merge
extra/yassl/src/handshake.cpp:
  Manual merge
extra/yassl/src/yassl_int.cpp:
  Manual merge
extra/yassl/taocrypt/include/runtime.hpp:
  Manual merge
extra/yassl/taocrypt/src/integer.cpp:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/trigger.result:
  Manual merge
mysql-test/t/trigger.test:
  Manual merge

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/trigger.result:
  Manual merge
mysql-test/t/trigger.test:
  Manual merge

Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 


mysql-test/include/have_udf.inc:
  Add check if udf_example.so(or similar) is available
mysql-test/lib/mtr_misc.pl:
  Add funcion "mtr_file_exist" to search for files
mysql-test/mysql-test-run.pl:
  Add checks to find the udf_example.so library
mysql-test/r/udf.result:
  Update result
mysql-test/t/disabled.def:
  Remove udf.test from disabled tests
mysql-test/t/udf.test:
  Use variable UDF_EXAMPLE_LIB when looking for shared library to load
mysql-test/r/have_udf_example.require:
  New BitKeeper file ``mysql-test/r/have_udf_example.require''

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/set_var.cc:
  Auto merged

  System variable was added out of lexical order.


sql/set_var.cc:
  System variable was added out of lexical order.

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


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

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

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

mysql-test/ndb/ndbcluster.sh:
  redirect to /dev/null to avoid grep -q

mysql-test/r/user_var.result:
  Update results
mysql-test/t/user_var.test:
  Remove unnecessary test

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

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

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


sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

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


mysql-test/mysql-test-run.pl:
  Resolve conflict

sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

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


sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

  
  This patch simply adds sql_big_selects to the list of variables
  output by SHOW VARIABLES.


mysql-test/r/variables.result:
  Update results
mysql-test/t/variables.test:
  Add new regression test (and make end-of-tests marker add output)
sql/set_var.cc:
  Add sql_big_selects to SHOW VARIABLES output

into  zim.(none):/home/brian/mysql/mysql-5.0

This patch restores sync_binlog.


sql/set_var.cc:
  restoring sync_binlog variable

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

- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error