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


client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  SCCS merged

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

extra/yassl/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff

Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.

- Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
- Add new variable mysqld_real_path
- Use mysqld_real_path from fill_instance_version


server-tools/instance-manager/instance_options.cc:
  Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
  Add new variable mysqld_real_path
  Use mysqld_real_path from fill_instance_version
server-tools/instance-manager/instance_options.h:
  Add new variable "mysqld_real_path"

mysql-test/t/disabled.def:
  Update disabled message

Looks like the trigger.test works that way


mysql-test/t/information_schema.test:
  Test it it works better to set no read access for a file by using 000 instead of -r

mysql-test/r/have_ndb_status_ok.require:
  New BitKeeper file ``mysql-test/r/have_ndb_status_ok.require''

mysql-test/include/have_ndb.inc:
  Remove the "exec test" and instead use the portable way to
  check an environment variable using "eval select". The value of 
  $NDB_STATUS_OK will this be replace by mysqltest and the query 
  "select "YES" and ndb_status_ok" will be sent to the server and back.
mysql-test/mysql-test-run.pl:
  Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to  set 
  it to NO if we detect that cluster can't be started.

 - Log boostratp/install to var/log/boostrap.log
 - Log output from mysqladmin to var/log/mysqladmin.log
 - Remove old manager references


mysql-test/lib/mtr_process.pl:
  Log output from mysqladmin to var/log/mysqladmin.log
mysql-test/mysql-test-run.pl:
  Log output from boostrap/install of db's to var/log/bootstrap.log
  Remove references to old manager

BitKeeper/etc/ignore:
  Added extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/test/test extra/yassl/testsuite/testsuite to the ignore list

 - Add test to see if tests are running with root permissions
 - Disables tests that uses chmod if that is the case


mysql-test/mysql-test-run.pl:
  Add test to check if mysql-test-run is run with root permission. 
  Set environment variable MYSQL_TEST_ROOT to 'YES' or 'NO'.
mysql-test/t/information_schema.test:
  Disable test if running as root
mysql-test/t/rpl_rotate_logs.test:
  Disable test if running as root.
mysql-test/include/not_as_root.inc:
  New BitKeeper file ``mysql-test/include/not_as_root.inc''
mysql-test/r/not_as_root.require:
  New BitKeeper file ``mysql-test/r/not_as_root.require''

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

Set building of shared libraries on QNX to defatul OFF


configure.in:
  -Libtool forgets to pass the -q64 and -X64 flags to "nm" and "xlc_r" when building
  for 64-bit on AIX. Add some hacks before we create libtool that fixes this.
  This test should be integrated into autoconf/libtool
  
  -Set default to not build shared librarues on QNX. When building libmysqlclient and libmysqlclient_r
  so many objects are passed to libtool that sh propably runs out of stack  and segfaults.

 - Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql


client/mysql.cc:
  Backport fix for mysql client not using SSl library directly
include/mysql.h:
  Backport fix for mysql client not using SSl library directly
libmysql/libmysql.def:
  Backport fix for mysql client not using SSl library directly
libmysqld/libmysqld.def:
  Backport fix for mysql client not using SSl library directly
sql-common/client.c:
  Backport fix for mysql client not using SSl library directly

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

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


configure.in:
  Auto merged

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

fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()

fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()

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

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

extra/yassl/taocrypt/benchmark/dh1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der''
extra/yassl/taocrypt/benchmark/dsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der''
extra/yassl/taocrypt/benchmark/rsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''

Add benchamrk to dirs to build


extra/yassl/taocrypt/Makefile.am:
  Add benchmark to dirs to build

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

extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

mysql-test/r/ctype_latin2_ch.result:
  Drot table at end of test
mysql-test/r/grant2.result:
  Drop users
mysql-test/r/openssl_1.result:
  Drop users
mysql-test/r/rpl_openssl.result:
  Drop users
mysql-test/r/sp-security.result:
  Drop users
mysql-test/r/sp_notembedded.result:
  Drop table
mysql-test/r/trigger.result:
  Drop table
mysql-test/t/ctype_latin2_ch.test:
  Drop table
mysql-test/t/grant2.test:
  Drop users
mysql-test/t/openssl_1.test:
  Drop users
mysql-test/t/rpl_openssl.test:
  Drop users
mysql-test/t/sp-security.test:
  Drop users
mysql-test/t/sp_notembedded.test:
  Drop table
mysql-test/t/trigger.test:
  Drop table