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

    changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
    added define NDB_INIT
    removed getarg, strlcat, strlcpy
    aligned ndb version with mysql version
    cpcd: removed old way of reading config file and replaced with mysql load_defaults
    changed from using getarg to my_getopts
    use mysql my_progname
    moved getarg to test


BitKeeper/deleted/.del-strlcat.c~250851f8f1ac1c2c:
  Delete: ndb/src/common/util/strlcat.c
BitKeeper/deleted/.del-strlcpy.c~43266e312d11c47b:
  Delete: ndb/src/common/util/strlcpy.c
ndb/test/include/getarg.h:
  Rename: ndb/include/util/getarg.h -> ndb/test/include/getarg.h
configure.in:
  aligned ndb versioning with mysql
  changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/include/ndb_global.h:
  added define NDB_INIT
  removed strlcpy, strlcat
ndb/src/common/editline/sysunix.c:
  removed usage of strlcat
ndb/src/common/util/Makefile.am:
  removed getarg, strlcat, strlcpy
ndb/src/common/util/basestring_vsnprintf.c:
  changed define from SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/src/common/util/socket_io.cpp:
  removed usage of strlcat
ndb/src/common/util/version.c:
  aligned ndb version with mysql version
ndb/src/cw/cpcd/common.cpp:
  removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/common.hpp:
  removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/main.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/blocks/backup/restore/main.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/error/ErrorReporter.cpp:
  use mysql my_progname
ndb/src/kernel/main.cpp:
  removed const in main declaration
ndb/src/kernel/vm/Configuration.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/vm/Configuration.hpp:
  removed const in main declaration
ndb/src/mgmclient/main.cpp:
  changed from usin getarg to my_opts
ndb/src/mgmsrv/main.cpp:
  changed from usin getarg to my_opts
ndb/src/ndbapi/Ndb.cpp:
  fixed compiler warnings
ndb/test/run-test/Makefile.am:
  moved getarg to test
ndb/test/src/Makefile.am:
  moved getarg to test
ndb/test/src/getarg.c:
  moved strlcat and strlcpy into getarg.c
ndb/tools/delete_all.cpp:
  changed from usin getarg to my_opts
ndb/tools/desc.cpp:
  changed from usin getarg to my_opts
ndb/tools/drop_index.cpp:
  changed from usin getarg to my_opts
ndb/tools/drop_tab.cpp:
  changed from usin getarg to my_opts
ndb/tools/listTables.cpp:
  changed from usin getarg to my_opts
ndb/tools/select_all.cpp:
  changed from usin getarg to my_opts
ndb/tools/select_count.cpp:
  changed from usin getarg to my_opts
ndb/tools/waiter.cpp:
  changed from usin getarg to my_opts

ndb/src/ndbapi/NdbBlob.cpp:
  misplaced code line + change blob tabledist
ndb/test/ndbapi/testBlobs.cpp:
  misplaced code line + change blob tabledist

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Move init of node-init-mutex to before alloc node id


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Move init of node-init-mutex to before alloc node id

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


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged

mysql-test/r/ndb_blob.result:
  bug-6018
mysql-test/t/ndb_blob.test:
  bug-6018
ndb/include/ndbapi/NdbBlob.hpp:
  bug-6018
ndb/include/ndbapi/NdbConnection.hpp:
  bug-6018
ndb/include/ndbapi/NdbIndexOperation.hpp:
  bug-6018
ndb/include/ndbapi/NdbOperation.hpp:
  bug-6018
ndb/src/ndbapi/NdbBlob.cpp:
  bug-6018
ndb/src/ndbapi/NdbConnection.cpp:
  bug-6018
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  bug-6018
ndb/src/ndbapi/NdbIndexOperation.cpp:
  bug-6018
ndb/src/ndbapi/NdbOperation.cpp:
  bug-6018
ndb/src/ndbapi/NdbOperationExec.cpp:
  bug-6018
ndb/test/ndbapi/testBlobs.cpp:
  bug-6018

  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
dict0dict.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name


innobase/dict/dict0crea.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
innobase/dict/dict0load.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
innobase/dict/dict0dict.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name
innobase/eval/eval0eval.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
innobase/pars/pars0pars.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
innobase/row/row0mysql.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it

mysql-test/include/ps_modify.inc:
  replace ... select now works.
mysql-test/r/ps_2myisam.result:
  replace ... select now works.
mysql-test/r/ps_3innodb.result:
  replace ... select now works.
mysql-test/r/ps_4heap.result:
  replace ... select now works.
mysql-test/r/ps_5merge.result:
  replace ... select now works.
mysql-test/r/ps_6bdb.result:
  replace ... select now works.
mysql-test/r/ps_7ndb.result:
  replace ... select now works.
mysql-test/t/ps_7ndb.test:
  replace ... select now works.
sql/sql_prepare.cc:
  Enable SQLCOM_REPLACE_SELECT: no need for any code changes but
  enable this SQLCOM in the switch.