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

BUILD/SETUP.sh:
  Abort if wrong options
BUILD/compile-pentium64-debug:
  Always use full debugging
innobase/fil/fil0fil.c:
  Fixed wrong printf() format

into mysql.com:/my/mysql-4.1

into mysql.com:/my/mysql-4.1

This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files

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

Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work

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

    remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix

  Added test case for bug #7672 that existed only in 4.0.


mysql-test/t/order_by.test:
  Added test case for bug #7672 that existed only in 4.0.
mysql-test/r/order_by.result:
  Added test case for bug #7672 that existed only in 4.0.

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

into mysql.com:/my/mysql-4.1

BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0

into mysql.com:/my/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

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

ndb/test/run-test/atrt-mysql-test-run:
  Fix result handling
ndb/test/run-test/daily-basic-tests.txt:
  Move mysql-test-run & testBackup into "basic"
ndb/test/run-test/daily-devel-tests.txt:
  Move mysql-test-run & testBackup into "basic"

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

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/include/univ.i:
  Auto merged

innobase/include/univ.i:
  InnoDB: Define UNIV_DEBUG when DBUG_ON (in MySQL) is defined.
  This enables InnoDB debug assertions in debug builds of mysqld.

into mysql.com:/my/mysql-4.1


BUILD/SETUP.sh:
  Auto merged

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

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

    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

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


sql/sql_table.cc:
  Auto merged

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

into hundin.mysql.fi:/home/jan/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