into hundin.mysql.fi:/home/marko/l/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  Test case for a #2996 bug fix
multi_update.test:
  test case for a #2996 bug fix
sql_select.cc:
  Fix for a bug #2996 involving multi-table updates over the const tables

We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).

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

re-using unused LOCK_active_mi to serialize all administrative
commands related to replication:
START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
(replication autostart at server startup), end_slave() (replication
autostop at server shutdown), LOAD DATA FROM MASTER.
This protects us against a handful of deadlocks (like BUG#2921
when two START SLAVE, but when two STOP SLAVE too).
Removing unused variables.

into hundin.mysql.fi:/home/marko/l/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/l/mysql-4.0

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

  reverting fix

  Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait

  Do not test a magic number with =, use == instead :)

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

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

added tests for testing structure of mysql db

ChangeSet 1.1620.12.1 and ChangeSet 1.1625.2.1
from 4.1. This makes the slave I/O thread flush the relay log 
after every event, which provides additional safety in case
of brutal crash (reduces chances to lose a part of the relay log).

- the one about BUG#2921
- the one about relay log flushing
Both will be rewritten in a next changeset
(this one will not be pushed before the next changeset).

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

  Add typecasts to ulong because ulint is __int64 in Win 64-bits
  Better error message to the .err log if we have to crash the server because the buffer pool is exhausted by the lock table or the adaptive hash index

into teton.kitebird.com:/home/paul/mysql-4.0

Fix comment typos. (Skipp -> Skip)

  This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.

(Fix hours/seconds always to display with two digits.)

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

INSERT DELAYED works only for one-row inserts (in latest 4.0 versions
at least). So killing a delayed_insert thread does not spoil replication:
the rows which actually went into the table are exactly those listed
in the binlog. So when the delayed_insert thread is killed, don't log
it as 'killed', because it causes superfluous stops on the slave.

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

Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"

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

Useful in case mysqld was started with chroot.

into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0