which does e.server_id=thd.server_id.

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

    "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
    So, in CHANGE MASTER:
    when it seems reasonable that the user did not want to discontinue
    its replication (i.e. when he is not specifying host or port or master_log_file
    or master_log_pos; this will be documented), set the coordinates of the
    I/O thread to those of the SQL thread. This way, the SQL thread will see
    no discontinuity in the relay log (i.e. will skip no events), because
    the I/O thread will fill the brand new relay log with the events which
    are just after the position where the SQL thread had stopped
    (before CHANGE MASTER was issued).
    And a new test for this bug.

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

Thanks to Daniel Convissor

into mysql.com:/home/walrus/bk/40

  Stop line wraping for compiler warnings.
  It needs for warnings statistic in code coverage

  Stop the line wrapping for warnings.
  it needs for warnings statistic in code coverage

into mysql.com:/home/kostja/mysql/mysql-4.0-root

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

fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

into mysql.com:/home/kostja/mysql/mysql-4.0-1724

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

rli->save_temporary_tables and slave_open_temp_tables
(in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
indefinitely by doing RESET SLAVE and replicating always the same CREATE
TEMPORARY TABLE).
It's critical to reset save_temporary_tables to 0 (otherwise you may later
read memory which has been freed) so this changeset should go into 4.1.

has changed since 4.0.14'
We need to calculate cost of RANGE
scan if it is present instead of cost of 
FULL scan.

into mysql.com:/my/mysql-4.0

Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.

- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.

of lock scope

into mysql.com:/home/kostja/mysql/mysql-4.0-root

thd->proc_info added

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

mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).

into mysql.com:/home/kostja/mysql/mysql-4.0-root

Don't add service name to read config file segments if it's "MySQL"
Fixed possible memory leak when CHANGE USER failed.

"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 serg.mylan:/usr/home/serg/Abk/mysql-4.0

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