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

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

it's crucial to disable Nagle algorithm on client for no-reply commands
(like mysql_stmt_free) to always work fast.
Nagle algorithm instructs the sender to buffer (store) data if any 
unacknowledged data is outstanding and the size of to-send data is less than
the network segment. It was exactly the case with COM_STMT_CLOSE after 
COM_STMT_PREPARE, so the client was waiting for Nagle timer to expire or
 for ACK from the server, while the server was holding up ACK because of 
delayed acknowledgement algorithm.
The tricky part is that we have been already disabling Nagle 
algorithm (by setting TCP_NODELAY)
almost everywhere except Windows (and maybe Netware).
It is the reason why the bug was repeatable only with Windows client.


vio/viosocket.c:
  A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower":
  if we disable Nagle algorithm, do it everywhere.

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


sql/mysqld.cc:
  Auto merged

lower_case_tables_names=2 is sensible. Related to Bug #7887.


sql/mysqld.cc:
  Set lower_case_file_system when it is being tested to check
  if lower_case_tables_names=2 is sensible.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


tests/mysql_client_test.c:
  Auto merged

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


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

  Bug#7145 Added cast to doublestore() and ARM


include/my_global.h:
  Added cast to doublestore() and ARM

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


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

  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
  Renamed client_test to mysql_client_test
  Support --embedded-server test on installed server
mysql_client_test.test:
  Renamed client_test to mysql_client_test
  Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
  Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test


mysql-test/mysql-test-run.sh:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test/t/mysql_client_test.test:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

  added ndb_restore test
ndb_restore.result, ndb_restore.test:
  new file


mysql-test/mysql-test-run.sh:
  added ndb_restore test
mysql-test/r/ndb_restore.result:
  added ndb_restore test

  backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0

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

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


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.

  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE


innobase/fil/fil0fil.c:
  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()

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

corrected possible unalignment in NdbRecAttr access methods

into mysql.com:/home/timka/mysql/src/4.1-virgin

  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works


innobase/fil/fil0fil.c:
  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works

  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition


innobase/dict/dict0dict.c:
  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition

into mysql.com:/home/timka/mysql/src/4.1-dbg


sql/sql_show.cc:
  Auto merged

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

SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo

  Make sure to ship error code in system error signal

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

libmysqld/examples/Makefile.am:
  - fixed a missing rename (mysql_client_test -> mysql_client_test_embedded)

- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)


tests/mysql_client_test.c:
  Rename: tests/client_test.c -> tests/mysql_client_test.c
libmysql/libmysql.c:
  - renamed client_test.c to mysql_client_test.c in a comment
libmysqld/examples/Makefile.am:
  - renamed client_test -> mysql_client_test_embedded
  - renamed mysqltest -> mysqltest_embedded
  - both will be installed in $bindir
scripts/make_binary_distribution.sh:
  - install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded
    into bin directory
tests/Makefile.am:
  - renamed client_test to mysql_client_test
BitKeeper/etc/ignore:
  Added tests/mysql_client_test to the ignore list

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

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

  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.

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

  release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read