remove options2 as it longer needed as serg put SELECT_ALL in bit 24, (removed something)
  making second word not needed


sql/sql_lex.cc:
  remove options2 as it no longer needed
sql/sql_lex.h:
  remove options2 as it no longer needed
sql/sql_yacc.yy:
  remove options2 as it no longer needed

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/bdb/dist/configure.ac:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged

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


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


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

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

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

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


ndb/tools/restore/consumer_restore.cpp:
  Auto merged

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

BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/make-config.sh:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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

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


ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

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


ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

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.