Docs/manual.texi:
  Update information about REPAIR and optimize
scripts/mysqlhotcopy.sh:
  Changed Alpha -> Beta
sql/sql_yacc.yy:
  A

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Update AIX information
support-files/Makefile.am:
  Removed mysql-max spec

innobase/row/row0sel.c:
  Fixed a typo in the fix to consistent read through a secondary index

buf0buf.h	Add checksum to written pages to check that they are also read in unchanged
buf0flu.c	Add checksum to written pages to check that they are also read in unchanged
buf0buf.c	Add checksum to written pages to check that they are also read in unchanged


innobase/buf/buf0buf.c:
  Add checksum to written pages to check that they are also read in unchanged
innobase/buf/buf0flu.c:
  Add checksum to written pages to check that they are also read in unchanged
innobase/include/buf0buf.h:
  Add checksum to written pages to check that they are also read in unchanged
innobase/log/log0recv.c:
  Add checksum to written pages to check that they are also read in unchanged

Docs/manual.texi:
  fixed paragraph
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/log_event.cc:
  Auto merged

sql/log_event.cc:
  cleanup
sql/mysqld.cc:
  Portability fix for AIX 4.2
  Fix for services on Windows

row0uins.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
row0umod.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
os0file.c	Reduce probability of deadlock bugs in connection with ibuf: do not let the ibuf i/o handler sleep


innobase/os/os0file.c:
  Reduce probability of deadlock bugs in connection with ibuf: do not let the ibuf i/o handler sleep
innobase/row/row0uins.c:
  Partial fix to the DROP TABLE + another user rolls back in that table problem
innobase/row/row0umod.c:
  Partial fix to the DROP TABLE + another user rolls back in that table problem
innobase/row/row0sel.c:
  Fix a bug in multiversioned reads through a secondary index

os0file.c	Always do fsync after a file write to reduce possibility of a partially written page in an OS crash
buf0rea.c	Fixed a recovery hang associated with ibuf bitmap pages


innobase/buf/buf0rea.c:
  Fixed a recovery hang associated with ibuf bitmap pages
innobase/os/os0file.c:
  Always do fsync after a file write to reduce possibility of a partially written page in an OS crash

sql/mysqlbinlog.cc:
  Added option -r.

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

client/mysqldump.c:
  Fixed all output to use 'result_file'
mysys/my_error.c:
  cleanup
mysys/raid.cc:
  cleanup

Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table


BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
  Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
  Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
  Added information about InnoDB and TEMPORARY tables
acinclude.m4:
  Portability fixes
client/errmsg.c:
  merge with libmysqd/errmsg.c
client/mysqladmin.c:
  DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
  Portability fixes
configure.in:
  Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
  Portability fixes
include/global.h:
  Portability fixes
isam/_dbug.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/show_check.result:
  New test for SHOW CREATE
mysql-test/t/show_check.test:
  New test for SHOW CREATE
scripts/make_binary_distribution.sh:
  Added missing files
sql/filesort.cc:
  Added examined_rows to slow query log
sql/log.cc:
  Added examined_rows to slow query log
sql/mysql_priv.h:
  Added examined_rows to slow query log
sql/mysqlbinlog.cc:
  Fixed core dump when using wrong option
sql/mysqld.cc:
  Removed not used argument
sql/sql_base.cc:
  Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
  Added examined_rows to slow query log
sql/sql_parse.cc:
  Added examined_rows to slow query log
sql/sql_select.cc:
  Added examined_rows to slow query log
sql/sql_select.h:
  Added examined_rows to slow query log
sql/sql_show.cc:
  Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
  Added examined_rows to slow query log

ha_innobase.cc	Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message


sql/ha_innobase.cc:
  Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message

Docs/manual.texi:
  Auto merged

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

added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master


client/mysqltest.c:
  fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
  do not automagically start slave
sql/log.cc:
  support for virtual master
sql/log_event.cc:
  fix for mysqlbinlog
sql/log_event.h:
  fix for mysqlbinlog
sql/mysqlbinlog.cc:
  fix for mysqlbinlog
sql/slave.cc:
  virtual master
sql/slave.h:
  virtual master
sql/sql_class.h:
  clean-up/fixes for virtual master
sql/sql_repl.cc:
  cleanup/fixes for virtual master
sql/sql_repl.h:
  virtual master

innobase/os/os0sync.c:
  Eliminate compiler warning in Win

innobase/os/os0file.c:
  Fix to the error message

innobase/os/os0file.c:
  Added better error message if disk is full; calls exit(1)

innobase/include/univ.i:
  If _NT_ defined, define also __NT__

innobase/os/os0file.c:
  Remove a compilation error on Windows

Docs/manual.texi:
  Added a link.

Docs/manual.texi:
  minor mods to recent change notes

Docs/manual.texi:
  New option, -r, to mysqldump. This is needed in MSDOS mode.
client/mysqldump.c:
  Added option -r for MSDOS mode.

client/mysqlcheck.c:
  Added option --autorepair and possibility to change the default
  behavior by changing the executable file name (copy / symlink)

Docs/manual.texi:
  missing @ on @item in contributed software page
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Updated mysqld-max section
acinclude.m4:
  Portability fix
include/m_ctype.h:
  Portability fix
innobase/configure.in:
  Portability fix

Docs/manual.texi:
  new links
scripts/make_binary_distribution.sh:
  Added missing files
sql/sql_select.cc:
  Added accidently removed line

Changed 'lib' to 'master-data'
Fix for slow slaves


Docs/manual.texi:
  Changelog
include/mysql.h:
  Fixes for Cygwin
libmysql/libmysql.c:
  Fixes for Cygwin
mysql-test/Makefile.am:
  Include missing test files
mysql-test/include/master-slave.inc:
  Fixes for slow slaves
mysql-test/install_test_db.sh:
  Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
  Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
  Test case for count(*) problem
mysql-test/t/group_by.test:
  Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
  Change 'lib' to 'master-data'
sql/sql_select.cc:
  Fix for count(*) problem

Docs/manual.texi:
  Updated TODO
client/mysqlcheck.c:
  Fixed portability problems
mysql-test/r/backup.result:
  Fixed output after format change for BACKUP TABLE
sql/ha_berkeley.cc:
  Added missing variable
sql/opt_range.cc:
  Small optimization when calculating key blocks

BitKeeper/etc/ignore:
  Added client/mysqlcheck to the ignore list
Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Auto merged

BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
  Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
  Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
  Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
  Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
  Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
  Cleanup
mysql-test/r/rpl000014.result:
  Change port number for comparison
mysql-test/r/rpl000015.result:
  Change port number for comparison
mysql-test/r/rpl000016.result:
  Change port number for comparison
mysql-test/t/rpl000014.test:
  Change port number for comparison
mysql-test/t/rpl000015.test:
  Change port number for comparison
mysql-test/t/rpl000016.test:
  Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
  New test results
sql-bench/Results/RUN-mysql-NT_4.0:
  New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New test results
sql-bench/Results/connect-mysql-NT_4.0:
  New test results
sql-bench/Results/create-mysql-NT_4.0:
  New test results
sql-bench/Results/insert-mysql-NT_4.0:
  New test results
sql-bench/Results/select-mysql-NT_4.0:
  New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New test results
sql/slave.cc:
  Removed not used variable