into mysql.com:/home/jonas/src/mysql-5.0-ndb

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

mysql-test/mysql-test-run.sh:
  Less restricted permissions.
mysql-test/r/rpl_rotate_logs.result:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
mysql-test/t/rpl_rotate_logs.test:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.

client/mysql.cc:
  Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
client/mysqlbinlog.cc:
  Fix for mysqlbinlog, mysql_close() needs to be called.
libmysql/Makefile.shared:
  Added use of my_rename()
mysql-test/mysql-test-run.sh:
  Added possibility to add file t/testname.disabled. This will disable a
  test with same base name. Additionally, if the .disabled file contains text,
  it will be appended as a comment after the test during run.

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

into mysql.com:/home/jonas/src/mysql-5.0-ndb

ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0-ndb

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"

sql/sql_parse.cc:
  Fix a comment.
sql/sql_select.cc:
  Fix a comment.

innobase/row/row0ins.c:
  One more after merge fix

innobase/include/univ.i:
  Auto merged
innobase/row/row0ins.c:
  After merge fixes of Jan Lindström's patch to 4.1

  after merge fix


tests/Makefile.am:
  after merge fix

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.

added handling of Arbit log events


ndb/examples/mgmapi_logevent_example/mgmapi_logevent.cpp:
  updated logevent example
ndb/include/mgmapi/ndb_logevent.h:
  added comments
  added handling af aritration events
ndb/src/mgmapi/ndb_logevent.cpp:
  added handling of Arit log events

into hundin.mysql.fi:/home/marko/j/mysql-5.0

It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973)


innobase/btr/btr0cur.c:
  Add parameter "offsets" to page_cur_insert_rec_low()
innobase/include/page0cur.h:
  page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
innobase/include/page0cur.ic:
  page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
innobase/include/rem0rec.h:
  Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
innobase/include/rem0rec.ic:
  Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
innobase/page/page0cur.c:
  page_cur_insert_rec_write_log(), page_cur_parse_insert_rec():
  write the status bits of the record to the log (Bug #7973)
  page_cur_insert_rec_low(): add parameter "offsets"
  page_copy_rec_list_end_to_created_page(): remove unnecessary call
  to mem_heap_create()
innobase/page/page0page.c:
  page_copy_rec_list_end_no_locks(), page_copy_rec_list_start():
  compute offsets and pass them to page_cur_rec_insert()

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

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

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

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


mysql-test/r/lowercase_table2.result:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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

  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.