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


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

    changed ndb_restore test somewhat to fisrt make the tables in myisam


mysql-test/mysql-test-run.sh:
  backported ndb_mgm options from 5.0
mysql-test/ndb/ndbcluster.sh:
  backported ndb_mgm options from 5.0
mysql-test/r/ndb_restore.result:
  changed ndb_restore test somewhat to fisrt make the tables in myisam
mysql-test/t/ndb_restore.test:
  changed ndb_restore test somewhat to fisrt make the tables in myisam

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

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

  Call file->external_lock() for handler objects that index_merge code creates in addition to 
  the handler object opened in open_and_lock_tables.

into mysql.com:/home/kostja/work/mysql-5.0-root


vio/viosocket.c:
  Auto merged

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.

BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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.

mysql-test/t/ctype_cp932.test:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_eucjpms.test:
  Change mode to -rw-rw-r--
BitKeeper/etc/ignore:
  Added libmysqld/ha_federated.cc to the ignore list

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


tests/mysql_client_test.c:
  Auto merged

BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
tests/client_test.c:
  Auto merged

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


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

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

  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

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


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

  backported access to ndb_mgm from 5.0


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

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


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

ndb/test/ndbapi/flexAsynch.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
  Add includes as memcpy is introduced in NdbRecAttr

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


ndb/tools/waiter.cpp:
  Auto merged

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

mysql-test/r/select_found.result:
  Auto merged

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.

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


innobase/fil/fil0fil.c:
  Auto merged

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

  Remove superfluous fprintf about log record application in InnoDB startup


innobase/log/log0recv.c:
  Remove superfluous fprintf about log record application in InnoDB startup

  Add a missing newline to an error print


innobase/fil/fil0fil.c:
  Add a missing newline to an error print

  Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
os0thread.c:
  test


innobase/os/os0thread.c:
  test
innobase/dict/dict0load.c:
  Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge