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

  Perl script to create HP depot packages.

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

  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

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.

  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-4.1-perl

'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

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

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

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

mysql-test/mysql-test-run.pl:
  start and exit fix for ndbcluster

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1


sql/ha_innodb.cc:
  Auto merged

sql/ha_innodb.cc:
  Auto merged
include/config-win.h:
  SCCS merged

  Make a more informative platform info for Windows

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

into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2

mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)

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

mysql-test/r/fulltext.result:
  SCCS merged
mysql-test/t/fulltext.test:
  SCCS merged

  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().


mysql-test/r/fulltext.result:
  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
mysql-test/t/fulltext.test:
  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().

into mysql.com:/home/mysql_src/mysql-4.1-clean

mysql-test/t/rpl_multi_query.test:
  disable ps-protocol as PS don't support multi-queries

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

mysql-test/t/delete.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged

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

  Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.


sql/sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
mysql-test/t/delete.test:
  Added a test case for bug #8392.
mysql-test/r/delete.result:
  Added a test case for bug #8392.

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


BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_nlq_search.c:
  Auto merged

  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)


myisam/ft_nlq_search.c:
  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/M41/mysql-4.1

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

into hundin.mysql.fi:/home/marko/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged

into mysql.com:/M41/mysql-4.1

2) Raise the version number to 4.1.11.


configure.in:
  Raise the version number from 4.1.10 to 4.1.11.

into mysql.com:/home/mysql_src/mysql-4.1-clean

vio/viosocket.c:
  Auto merged
mysql-test/t/group_by.test:
  Use local file
sql/sql_parse.cc:
  Merge with 4.0 to get bug fix for reconnect problem