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

  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.

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

  Correct English grammar


sql/ha_innodb.cc:
  Correct English grammar

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

       bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).


client/mysqlcheck.c:
  A fix (bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
myisam/myisamchk.c:
  A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa).

  Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output


innobase/dict/dict0load.c:
  Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output

Build-tools/mysql-copyright:
  Auto merged
Docs/Support/texi2html:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/eval/eval0eval.c:
  Auto merged
innobase/pars/pars0pars.c:
  Auto merged

  Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.


strings/ctype-sjis.c:
  Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
mysql-test/t/ctype_sjis.test:
  Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
mysql-test/r/ctype_sjis.result:
  Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.

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

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

    added libNDBT.a
   removed printout
    fixed error that ndb_show_tables required table name


configure.in:
  fix for solaris forte -instances=static
ndb/test/run-test/Makefile.am:
  added libNDBT.a
ndb/tools/drop_tab.cpp:
  removed printout
ndb/tools/listTables.cpp:
  removed printout
  fixed error that ndb_show_tables required table name
ndb/tools/waiter.cpp:
  removed printout

having approval for it since 4.1.4, I also have some assurance that
very few people actually used this: to enable these calls a user
had to #define HAVE_DEPRECATED_411_API and recompile the client library.


include/mysql.h:
  remove defines for obsolete 4.1 prepared statements C API names
libmysql/libmysql.c:
  Remove #ifdefed implementation of obsolete mysql_prepare call.

ndb/src/ndbapi/NdbBlob.cpp:
  restore backwards compatibility

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

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

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

  added flag on sun forte, -instances=static
  (check is only made for "non-gcc", hopefully enough)


configure.in:
  added flag on sun forte, -instances=static
  (check is only made for "non-gcc", hopefully enough)

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

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