client/mysqltest.c:
  autocommit
mysql-test/Makefile.am:
  changed mysql_test_run to mysql_test_run_new

mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged

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

  changed to use new switch


mysql-test/ndb/ndbcluster.sh:
  updated start script for ndbcluster to make better cleanup
ndb/test/run-test/main.cpp:
  changed to use new switch

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  bug #6426 fix

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

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

  ugly fix for 'quadita2' ia64 icc -O1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ugly fix for 'quadita2' ia64 icc -O1

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331

  "SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.


mysql-test/t/sql_mode.test:
  "SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
mysql-test/r/sql_mode.result:
  "SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.
sql/field.cc:
  "SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.

  Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable


innobase/ibuf/ibuf0ibuf.c:
  Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable

ndb/src/ndbapi/ndberror.c:
  826 error text
mysql-test/r/ndb_blob.result:
  result displayed error
mysql-test/t/ndb_blob.test:
  result displayed error
ndb/src/ndbapi/NdbBlob.cpp:
  update head+inline earlier
ndb/src/ndbapi/NdbOperationExec.cpp:
  blob IgnoreError bug
ndb/test/ndbapi/testBlobs.cpp:
  tried to set non-nullable to null, causing a complex abort case
ndb/src/ndbapi/NdbConnection.cpp:
  prepared ops CAN be left in complex abort

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

into mysql.com:/home/bk/b5551-4.1-v4

The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.


sql/sql_parse.cc:
  No binlog error generated
sql/sql_table.cc:
  Documentation
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

there was a clash in using -c, added -f as the future proof switch


mysql-test/ndb/ndbcluster.sh:
  changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
  there was a clash in using -c, added -f as the future proof switch

  Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.


mysql-test/t/range.test:
  Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.
mysql-test/r/range.result:
  Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.
sql/opt_range.cc:
  Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.

http://lists.mysql.com/internals/18149

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


sql/mysqld.cc:
  Auto merged
configure.in:
  Auto merged

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

    remove compiler warning
    patch for my_vsnprintf not dully implemented
    patch for platfroms that return -1 on snprintf overflow
    compile fix for hpux


configure.in:
  add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
ndb/src/common/editline/sysunix.c:
  remove compiler warning
ndb/src/common/util/basestring_vsnprintf.c:
  patch for my_vsnprintf not dully implemented
  patch for platfroms that return -1 on snprintf overflow
ndb/src/kernel/vm/Emulator.hpp:
  compile fix for hpux
ndb/src/mgmsrv/Services.cpp:
  compile fix for hp ux
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  remove compiler warning

Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test


client/mysqltest.c:
  Removed compiler warning
  Fixed identation & comments from earlier push
  Renamed variable 'disable_abort_on_error' to 'abort_on_error'
  Ensure that '$mysql_errno' also with --ps-protocol
include/mysql_com.h:
  Removed special handling of net_flush for embedded server
mysql-test/r/mysqltest.result:
  Remove usage of !$ in tests
mysql-test/t/client_test.test:
  Use --silent
mysql-test/t/comments.test:
  Remove usage of !$ in tests
mysql-test/t/join_outer.test:
  Remove usage of !$ in tests
mysql-test/t/key.test:
  Remove usage of !$ in tests
mysql-test/t/mysqltest.test:
  Remove usage of !$ in tests
mysql-test/t/show_check.test:
  Remove usage of !$ in tests
mysql-test/t/temp_table.test:
  Remove usage of !$ in tests
mysql-test/t/type_ranges.test:
  Remove usage of !$ in tests
sql/mysqld.cc:
  Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
sql/net_serv.cc:
  Remove special usage of net_flush in embedded server
sql/protocol.cc:
  Added protocol::flush() for easier embedded-server code
sql/protocol.h:
  Added protocol::flush() for easier embedded-server code
sql/sql_prepare.cc:
  Added protocol::flush() for easier embedded-server code
  Remove one extra flush() for prepared statements
sql/sql_show.cc:
  Added protocol::flush() for easier embedded-server code
tests/client_test.c:
  Added option --silent

into build.mysql.com:/users/rburnett/mysql-4.1-current

sql/mysqld.cc:
  changed to open log_error_file instead of "mysql.err" on Windows

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


innobase/dict/dict0load.c:
  Auto merged

into mysql.com:/M41/mysql-4.1

mysql-test/r/ps_10nestset.result:
  Result of expanded test: "MOD" on non-integral first operand.
mysql-test/t/ps_10nestset.test:
  Use the newly expanded "MOD" operator (non-integral first operand, bug#6138).

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

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

Fix so that signed/unsigned char does not matter in comparision


ndb/src/ndbapi/NdbOperationExec.cpp:
  Fix so that signed/unsigned char does not matter in comparision

ndb/src/ndbapi/NdbBlob.cpp:
  fix blob parts distribution - backwards compatible

into mysql.com:/usr/home/bar/mysql-4.1

  Allow mixing of different character sets for more SQL functions.
item_func.h:
  Allow mixing of different character sets for more SQL functions..


sql/item_cmpfunc.cc:
  Allow mixing of different character sets for more SQL functions.
sql/item_func.cc:
  Allow mixing of different character sets for more SQL functions.
sql/item_func.h:
  Allow mixing of different character sets for more SQL functions..
sql/item_strfunc.cc:
  Allow mixing of different character sets for more SQL functions.
sql/item.cc:
  Allow mixing of different character sets for more SQL functions.
sql/item.h:
  Allow mixing of different character sets for more SQL functions.
mysql-test/t/ctype_recoding.test:
  Allow mixing of different character sets for more SQL functions.
mysql-test/r/ctype_recoding.result:
  Allow mixing of different character sets for more SQL functions.