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

 slave start io_thread 
 slave start sql_thread
same for stop


sql/lex.h:
  slave start <options>
sql/sql_lex.cc:
  slave start <options>
sql/sql_lex.h:
  slave start <options>
sql/sql_repl.cc:
  slave start <options>
sql/sql_yacc.yy:
  slave start <options>

into mysql.sashanet.com:/reiser-data/mysql-4.0

not yet tested - will not be pushed for a few hours - need to commit in 
order to pull


BUILD/compile-pentium-debug:
  link statically
sql/slave.cc:
  properly seek the position when recovering from a partial read

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

I have tested it with tcpd wrapper and it worked on Linux.
I did not change setttings in hosts.deny, as I did not dare too.

sql/slave.cc:
  fixed wrong invocation of safe_sleep()

into mysql.sashanet.com:/reiser-data/mysql-4.0


include/my_sys.h:
  Auto merged

include/my_sys.h:
  added DBUG_ASSERT_LOCK()
sql/slave.cc:
  use DBUG_ASSERT_LOCK()

  Update
mirrors.texi:
  Add new mirrors
manual.texi:
  Remove link to mxODBC


Docs/manual.texi:
  Remove link to mxODBC
Docs/mirrors.texi:
  Add new mirrors
Docs/Flags/turkey.gif:
  Update
Docs/Flags/turkey.eps:
  Update
Docs/Flags/norway.gif:
  Update
Docs/Flags/norway.eps:
  Update

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Document when --xml was added to mysql/mysqldump.

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


Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged

Fix bug when using option groups


libmysql/libmysql.c:
  Fix bug when using option groups
myisam/myisamchk.c:
  Portability fix
mysys/my_getopt.c:
  Portability fix

Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged

Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Docs/manual.texi:
  Updated autoconf information

into mysql.sashanet.com:/reiser-data/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
configure.in:
  Version change
sql/sql_base.cc:
  Correct fix for not freed memory when using corrupted tables
sql/table.cc:
  Correct fix for not freed memory when using corrupted tables

configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

Fix for --enable-local-infile
Portability fix for bison


bdb/dist/s_recover:
  Update for new POSIX spec
configure.in:
  Fix for --enable-local-infile
libmysql/libmysql.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Update for new POSIX spec
scripts/safe_mysqld.sh:
  Update for new POSIX spec
sql-bench/server-cfg.sh:
  Update for new POSIX spec
sql/sql_yacc.yy:
  Portability fix for bison

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

mysql-test/mysql-test-run.sh:
  Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
  Added result for a new test of combo of options for FOUND_ROWS and
  BUFFER_RESULT
mysql-test/t/select_found.test:
  Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
  Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged

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


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Altered regex to catch all indexterms - not just role='cp|fn'

of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)


sql/slave.cc:
  added DBUG_ASSERT()
sql/slave.h:
  fixed cache initialization problem