BitKeeper/deleted/.del-sync0ipm.c~48eb5196b6819734:
  Delete: innobase/sync/sync0ipm.c
BitKeeper/deleted/.del-sync0ipm.h~92a27f3bd9b15164:
  Delete: innobase/include/sync0ipm.h
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Delete: innobase/include/sync0ipm.ic
innobase/sync/makefilewin:
  Remove unused file sync0ipm.c
innobase/include/Makefile.am:
  Remove unused files sync0ipm.h and sync0ipm.ic
innobase/sync/Makefile.am:
  Remove unused file sync0ipm.c

BitKeeper/deleted/.del-os0shm.h~72e5e03d7b74061f:
  Delete: innobase/include/os0shm.h
BitKeeper/deleted/.del-os0shm.c~489ce7f33d07ffa:
  Delete: innobase/os/os0shm.c
BitKeeper/deleted/.del-os0shm.ic~1cac6731d2a64d53:
  Delete: innobase/include/os0shm.ic
innobase/include/Makefile.am:
  Remove unused files os0shm.h and os0shm.ic
innobase/os/Makefile.am:
  Remove unused file os0shm.c
innobase/os/makefilewin:
  Remove unused file os0shm.c

sql/ha_innodb.cc:
  simple optimization
sql/sql_show.cc:
  Simple optimization

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

by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.


client/mysqltest.c:
  in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL,
  it may be that the slave SQL thread did not have time to start yes, so we sleep
  1 sec and retry, 4 times at most.
mysql-test/r/rpl_server_id2.result:
  result update
mysql-test/t/rpl_server_id2.test:
  master_slave.inc already drops the table

  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query


sql/sql_class.h:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/ha_innodb.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/log_event.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/slave.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_db.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_parse.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_show.cc:
  Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query

innobase/include/ut0mem.h:
  Remove unused function ut_str_catenate()
innobase/ut/ut0mem.c:
  Remove unused function ut_str_catenate()

Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len


innobase/trx/trx0trx.c:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/lock/lock0lock.c:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/include/trx0trx.h:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
sql/ha_innodb.cc:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len

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

  A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads


sql/ha_innodb.cc:
  A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads

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

   make_binary_distribution (bug#2857)


scripts/make_binary_distribution.sh:
   - make sure the binaries are executable before calling them (bug#2857)

  innobase_mysql_print_thd(): protect thd with LOCK_thread_count (Bug #3596)


sql/ha_innodb.cc:
  innobase_mysql_print_thd(): protect thd with LOCK_thread_count

innobase/dict/dict0dict.c:
  dict_index_name_print(): output table name to file, not stderr

innobase/os/os0file.c:
  Remove os_file_lock()

sql/ha_innodb.cc:
  innobase_mysql_print_thd(): initial fix to Bug #3596

  Backport suppression of MSVC++ warning from 4.1


innobase/eval/eval0eval.c:
  Backport suppression of MSVC++ warning from 4.1

 - Tagged ChangeSet@1.1800.1.1 as "mysql-4.0.19"


configure.in:
   - Bumped up version number from 4.0.19 -> 4.0.20

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

innobase/btr/btr0btr.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/dict/dict0load.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/ibuf/ibuf0ibuf.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/lock/lock0lock.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0ins.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0sel.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0umod.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0upd.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/trx/trx0rec.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/ut/ut0dbg.c:
  Changed bug reporting address to http://bugs.mysql.com

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

innobase/row/row0mysql.c:
  Compare database part of table name with memcmp(), not strcmp()

into mysql.com:/home/mydev/mysql-4.0-bug2831

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

"phrase search" should not match partial words (it should not match 'paraphrase searches')

into mysql.com:/home/mydev/mysql-4.0-bug2831

mysql-test/t/rpl000015.test:
  Fix replace_result of $MASTER_MYPORT instead of literal numbers.
  The test case rpl000015 needs one exlpicit literal number.
  It changes partial master settings, which seems to reset other settings
  to their defaults. To test this is obviously the intent of this case.

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

innobase/row/row0mysql.c:
  Revert accidental modification to row_lock_table_autoinc_for_mysql()
  made in ChangeSet@1.1794.1.1
mysql-test/r/innodb.result:
  Revert ChangeSet@1.1794.1.1

into mysql.com:/home/mydev/mysql-4.0-bug2831


BitKeeper/etc/logging_ok:
  auto-union

into a80-186-24-72.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

to use long query strings with it.
Bug#3633


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

myisam/mi_dynrec.c:
  need DBUG_RETURN as we DBUG_ENTER

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_acl.cc:
  Auto merged

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

very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update


mysql-test/r/rpl_server_id2.result:
  result update
mysql-test/t/rpl_server_id2.test:
  We stop the slave before cleaning up otherwise we'll get
  'drop table t1' executed twice, so an error in the slave.err
  (not critical).
sql/slave.cc:
  update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)