into  mysql.com:/usr/home/bar/mysql-5.0-kt

  Adding test case.
item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.


sql/item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.
mysql-test/t/func_str.test:
  Adding test case.
mysql-test/r/func_str.result:
  Adding test case.

into  mysql.com:/usr/home/bar/mysql-5.0-kt


sql-common/client.c:
  Auto merged

into  ymer.(none):/usr/local/mysql/tmp-5.0

Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.


mysql-test/r/wait_timeout.result:
  Fix two races in test.
mysql-test/t/wait_timeout.test:
  Fix two races in test.

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

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

into trift2.:/M50/merge-5.0


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

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

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


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

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


ndb/src/ndbapi/DictCache.cpp:
  Auto merged

- don't invalidate tables that are in state RETRIEVING

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

- updated error message to more correctly reflect the issue

Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).


mysql-test/mysql-test-run.pl:
  Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
  line in its output, because otherwise we lack the information how the test suite was run.
  Add the line.

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

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


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

- remove some event code to get rid of some bugs

into  mysql.com:/data0/knielsen/tmp-5.0

  fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close

into  mysql.com:/data0/knielsen/tmp-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0


include/my_sys.h:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

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

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


sql/ha_ndbcluster.cc:
  Auto merged

  
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
  
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.


sql/item_cmpfunc.cc:
  c_ptr() makes incorrect assumptions about the string we get from
  out of args[0]->val_str(&tmp); c_str_safe() is more defensive.

  Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def


sql-common/client.c:
  Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def

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

  Use Perl for filtering, do more filtering


netware/BUILD/mwasmnlm:
  Use Perl for filtering, do more filtering
netware/BUILD/mwccnlm:
  Use Perl for filtering, do more filtering
netware/BUILD/mwldnlm:
  Use Perl for filtering, do more filtering

  Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
  Filter garbage characters from output


netware/BUILD/mwasmnlm:
  Filter garbage characters from output
netware/BUILD/mwccnlm:
  Filter garbage characters from output
netware/BUILD/mwldnlm:
  Filter garbage characters from output
tests/Makefile.am:
  Avoid duplicate symbol errors on Netware

into mysql.com:/home/gluh/MySQL/Merge/5.0-kt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

  Don't define __NT__ for 'Max' target


VC++Files/sql/mysqld.vcproj:
  Don't define __NT__ for 'Max' target

into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged