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

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


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

ndb/include/ndbapi/NdbScanFilter.hpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/common/util/NdbSqlUtil.cpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/ndbapi/NdbScanFilter.cpp:
  TUP scan filter support for LIKE/NOT_LIKE

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

code, because a warning was given also.

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


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

sql/mysql_priv.h:
  Fixed Bug#8042, "mysqld crashes on sighup".
  Removed use of thd. The information added to thd was unneccessary.
sql/sql_test.cc:
  Fixed Bug#8042, "mysqld crashes on sighup".
  Removed thd->proc_infos.

into mysql.com:/space/pekka/ndb/version/my50

mysql-test/r/ps_7ndb.result:
  accept result

support-files/mysql.spec.sh:
  Auto merged

support-files/mysql.spec.sh:
  - fixed a changelog entry (wrong author)

mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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

into rurik.mysql.com:/home/igor/mysql-5.0

  corrected spelling


ndb/include/transporter/TransporterRegistry.hpp:
  corrected spelling

ndb/include/transporter/TransporterRegistry.hpp:
  added comment

  Perl script to create HP depot packages.

  Manual post-merge


mysql-test/t/select.test:
  Manual post-merge

into rurik.mysql.com:/home/igor/mysql-4.1

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/select.result:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

  Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.


sql/sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.
sql/item.h:
  Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.

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


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

mysql-test/mysql-test-run.pl:
  Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.


sql/sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
mysql-test/t/select.test:
  Added a test case for bug #7098.
mysql-test/r/select.result:
  Added a test case for bug #7098.

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

  Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code


mysql-test/mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code
mysql-test/lib/init_db.sql:
  Make SQL more readable, substitute hostname at runtime

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

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

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


mysql-test/t/ps_1general.test:
  Auto merged

'ps_1general' and 'fulltext_cache' test cases.


mysql-test/r/fulltext_cache.result:
  To pass on Windows, round to less digits
mysql-test/t/fulltext_cache.test:
  To pass on Windows, round to less digits
mysql-test/t/ps_1general.test:
  To pass on Windows, change \\ to / in result
mysql-test/t/rpl_delete_all.test:
  To pass on Windows, change \\ to / in result
mysql-test/mysql-test-run.pl:
  Pass mysqld --console to catch output on Windows
mysql-test/lib/mtr_process.pl:
  Check error from exec() to avoid becoming a fork() bomb

ndb/src/mgmsrv/ConfigInfo.cpp:
  fixPortNumber:
  - Remove unneeded is_mgm_connection variable
  - restore functionality of specifying a port number per connection.

into mysql.com:/home/dellis/bkl/bug-4.1

into mysql.com:/home/cps/mysql/trees/mysql-5.0

Recommited, as I made a typo in the previous patch myself =)


BUILD/SETUP.sh:
  Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max

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

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports