into mysql.com:/home/svoj/devel/yassl-mysql-5.0

into mysql.com:/home/svoj/devel/yassl-mysql-5.0

into mysql.com:/home/bk/mysql-5.0

BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged

into mysql.com:/home/bk/b6883-mysql-4.1

ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1-push

into mysql.com:/home/jonas/src/mysql-4.1-push

  Enable retry on startTransaction


ndb/tools/restore/consumer_restore.cpp:
  Enable retry on startTransaction==NULL

  Fix for link failures on boxes with non-gnu compiler.


client/Makefile.am:
  Add a dummy C++ file to client suite to make libtool use a C++ linker:
  this lets client suite link when using yaSSL and a non-gcc C++ compiler.
config/ac-macros/yassl.m4:
  HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
tests/Makefile.am:
  Add a dummy C++ file to tests to make libtool use a C++ linker:
  this lets tests link when using yaSSL and a non-gcc C++ compiler.
vio/Makefile.am:
  Use dummy C++ file if configured with yaSSL only.

mysql-test/Makefile.am:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  SCCS merged

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


client/mysql.cc:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

into mdk10.(none):/home/reggie/bk/mysql-5.0-base


myisam/mi_open.c:
  Auto merged

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

into mdk10.(none):/home/reggie/bk/50test2

into mdk10.(none):/home/reggie/bk/41test3

client/mysqlshow.c:
  change to using mysql_real_escape_string
  Also, passing in length of from string "table" instead of to string "rows"

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


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

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


mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

Fixes IsAligned yaSSL assertion failure.


extra/yassl/include/buffer.hpp:
  Merge with latest yaSSL.
extra/yassl/include/factory.hpp:
  Merge with latest yaSSL.
extra/yassl/include/openssl/ssl.h:
  Merge with latest yaSSL.
extra/yassl/include/yassl_int.hpp:
  Merge with latest yaSSL.
extra/yassl/include/yassl_types.hpp:
  Merge with latest yaSSL.
extra/yassl/mySTL/stdexcept.hpp:
  Merge with latest yaSSL.
extra/yassl/src/buffer.cpp:
  Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/block.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hash.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hmac.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/integer.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/modes.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/rsa.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/aes.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/dsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/hash.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/md5.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/ripemd.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/rsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/sha.cpp:
  Merge with latest yaSSL.

into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged

  Fixed valgrind complaints. This fixes the memory leak problems for
  procedured, and partially for functions. There's still a leak involving
  results from functions that turned out to be too involved, so it will be
  fixed separately.


mysql-test/r/sp.result:
  Fixed some minor mistake (spotted while debugging).
mysql-test/t/sp.test:
  Fixed some minor mistake (spotted while debugging).
sql/item_func.cc:
  Moved Item_func_sp::cleanup() from item_func.h to ease debugging,
  and made a debug output come out right.
sql/item_func.h:
  Moved Item_func_sp::cleanup() to item_func.cc to ease debugging.
sql/sp_head.cc:
  Fixed valgrind problems with the previous memory leak fix (unit cleanup and
  putting result field in a differen mem_root), and removed prealloc flag from
  init_alloc_root() calls.
sql/sp_rcontext.cc:
  New mem_root pointer used for return fields from functions.
sql/sp_rcontext.h:
  New mem_root pointer used for return fields from functions.

into mysql.com:/home/omer/source/src50_0609


BitKeeper/etc/logging_ok:
  auto-union

into mysql.com:/space/my/mysql-5.0


mysql-test/Makefile.am:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-5.0.7-clone


mysql-test/Makefile.am:
  Auto merged

  the SSL tests pass

Fix mem leak in testBlobs


ndb/test/ndbapi/testBlobs.cpp:
  Fix mem leak in testBlobs

  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows


innobase/os/os0file.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/os/os0sync.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows

    don't start ndb cluster if no test uses it.


mysql-test/mysql-test-run.sh:
  don't start ndb cluster if no test uses it.

   Fix stack overflow in ndb_cpcd on amd64


ndb/src/common/logger/Logger.cpp:
  Fix stack overflow in ndb_cpcd on amd64

  script fixes for solaris


ndb/src/cw/cpcd/main.cpp:
  fix usage of load_defaults, as it does have a short option
ndb/test/run-test/make-config.sh:
  fix script wrt solaris
ndb/test/run-test/ndb-autotest.sh:
  fix script wrt solaris

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).


mysql-test/r/heap.result:
  Update results
mysql-test/r/type_varchar.result:
  Update results