"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".

Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal 
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.

New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.

Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.

into mysql.com:/home/mysql_src/mysql-4.0

** I already fixed it in 3.23; I fix it in 4.0 separately because the
code is a bit different (so the changeset 1.1422 of 3.23 should not be
merged here) **
Make mysqlbinlog prompt for the password if
mysqlbinlog -p
instead of printing the usage().
This makes mysqlbinlog behave like other clients.
This new code was almost copied from mysqldump.
Note that before, one could use
  mysqlbinlog -p pass
and now one must use
  mysqlbinlog -ppass
(putting a space will ask for the password).

  Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

  Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

into oak.local:/home/kostja/mysql/mysql-4.0-1274

to enable SHOW SLAVE STATUS again.

while the slave is connected.

into mysql.com:/space/my/mysql-4.0

   and Tru64 when running "mysql_install_db"

into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0

Portability fix (For Mac OS X)

into mashka.mysql.fi:/home/my/mysql-4.0

NetWare platform, so changes are visible in the tree 
but cannot affect other platforms.

into mashka.mysql.fi:/home/my/mysql-4.0

Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)

into mashka.mysql.fi:/home/my/mysql-4.0

existed, causing problems on non-case-sensitive OSes.
Deleted conflicting file.

make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.

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

query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.

into mashka.mysql.fi:/home/my/mysql-4.0

Changed --remote to --read-from-remote-server (mysqlbinlog)

into narttu.mysql.fi:/my/mysql-4.0