mysql-test/fix-result:
  updated version
mysql-test/r/rpl_log.result:
  fixed result to be portable

  Remove "for windows"
  Updated contributed software link


Docs/manual.texi:
  Remove "for windows"

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


Docs/manual.texi:
  Auto merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master


client/mysqltest.c:
  fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
  connect to port specified in environment
mysql-test/mysql-test-run.sh:
  added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
  fixes to slave off 3.23 master
sql/log_event.h:
  fixes to slave off 3.23 master
sql/slave.cc:
  do not log CREATE TABLE when doing table dump

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


Docs/manual.texi:
  Auto merged

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


Docs/manual.texi:
  Auto merged

  Remove links to /company/people/index.html


Docs/manual.texi:
  Remove links to /company/people/index.html

  Update mirror listing


Docs/manual.texi:
  Update mirror listing

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log


client/mysqlbinlog.cc:
  work to enable reading 3.23 logs
libmysql/Makefile.shared:
  added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
  added --start-and-exit
mysql-test/r/rpl000002.result:
  result clean-up
mysql-test/r/rpl000016.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/t/rpl000016.test:
  test cleanup
mysys/mf_iocache.c:
  fixed new bug
sql/log.cc:
  write start event only on server start or after reset master
sql/log_event.cc:
  work to enable reading 3.23 log format
sql/log_event.h:
  work to enable reading 3.23 format
sql/repl_failsafe.cc:
  code restructuring
sql/repl_failsafe.h:
  re-organized code
sql/slave.cc:
  check master version
sql/slave.h:
  old_format member
sql/sql_class.h:
  allow user to specify io cache type
  need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
  code re-organization
sql/sql_repl.cc:
  code reorganization
sql/sql_repl.h:
  reorganized code

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

into volk.internalnet:/home/tonu/mysql-4.0


sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run


include/my_sys.h:
  fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
  fixed missing \ bug
  added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
  do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
  rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
  fixed shutdown bug when singals DO break read introduced by the fix for 
  when they don't.
sql/repl_failsafe.cc:
  fixed memory leak

manual.texi	typo


Docs/manual.texi:
  website -> web site

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  some mods to ch 1 index entries; other minor tweaks

Docs/manual.texi:
  Changelog
mysql-test/r/update.result:
  Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
  Test found bug in UPDATE .. ORDER BY

mysys/my_lib.c:
  Fix for amiga
sql-bench/crash-me.sh:
  Fix wrong comment when testing for transactions

Docs/manual.texi:
  Auto merged