Docs/manual.texi:
  minor change notes mods

innobase/include/os0file.h:
  Define always WIN_ASYNC_IO, check at run-time if the OS actually supports it

into donna.mysql.fi:/home/heikki/mysqle

srv0start.c	InnoDB should now run with the same binary on Win95 and NT: checks OS version


innobase/srv/srv0start.c:
  InnoDB should now run with the same binary on Win95 and NT: checks OS version
innobase/include/os0file.h:
  InnoDB should now run with the same binary on Win95 and NT: checks OS version

os0file.c	Changed file write buffer size in os_file_set_size from 16 MB to 8 MB


innobase/os/os0file.c:
  Removed extraneous fsync and corected a typo in Windows code

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

Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.


Docs/manual.texi:
  Small cleanups
configure.in:
  Force close of sockets on HPUX 10.20
mysql-test/t/merge.test:
  Remove used tables
mysys/default.c:
  Support option lines longer than 256 chars.
mysys/mf_keycache.c:
  Split check_keycache tags
sql/mysqld.cc:
  Move things to 'cleanup'.
  Close the slow log at shutdown.
  Always allow debug options
sql/violite.c:
  Change the error tag to vio_error

manual.texi	change "InnoDB consinsten read" to
manual.texi	"InnoDB consistent read" in @node lines
manual.texi	(to match section's actual title)
manual.texi	cleanups to "installing from development source
manual.texi	tree" section


Docs/manual.texi:
  more development tree section changes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ibuf0ibuf.c	Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
log0log.c	Retrieve a dummy value from a function to prevent gcc crashing on HP-UX


innobase/log/log0log.c:
  Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
innobase/ibuf/ibuf0ibuf.c:
  Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union

ignore  	added Logs/* binary/*


BitKeeper/etc/ignore:
  added Logs/* binary/*
Build-tools/Do-patch-file:
  Fix typo (extra 'mv')
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into threads.polyesthetic.msg:/usr/local/src/my/3


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

Docs/manual.texi:
  @[XXX] -> @{[XXX]} (syntax error)

to bdb/dist/s_rpc so that bk doesn't complain about the
rpc_server/db_server_proc.c file that gets overwritten (but needs to
be stored in BK).  Add a bdb/dist/template directory which is needed
by bdb/dist/s_recover.


BitKeeper/deleted/.del-gen_client_ext.h~5c621cacb18b38:
  Delete: bdb/include/gen_client_ext.h
BitKeeper/deleted/.del-gen_client_ret~786a5e65119b3991:
  Delete: bdb/dist/template/gen_client_ret
BitKeeper/deleted/.del-db_server.x~811aeb6b630fe7aa:
  Delete: bdb/rpc_server/db_server.x
BitKeeper/deleted/.del-db_server_proc.sed~1a9af8e5b051acbd:
  Delete: bdb/rpc_server/db_server_proc.sed
BitKeeper/deleted/.del-db_server_proc~2e8b49d42aefab55:
  Delete: bdb/dist/template/db_server_proc
BitKeeper/deleted/.del-gen_server_ext.h~fd7bcfe6bbca8bcb:
  Delete: bdb/include/gen_server_ext.h
BitKeeper/deleted/.del-db_archive.dsp~e3da826e91bb086:
  Delete: bdb/build_win32/db_archive.dsp
BitKeeper/deleted/.del-db_checkpoint.dsp~8071af22db95b1db:
  Delete: bdb/build_win32/db_checkpoint.dsp
BitKeeper/deleted/.del-db_deadlock.dsp~befd45d29eaeb672:
  Delete: bdb/build_win32/db_deadlock.dsp
BitKeeper/deleted/.del-db_dll.dsp~4e9dda53c84511b6:
  Delete: bdb/build_win32/db_dll.dsp
BitKeeper/deleted/.del-db_dump.dsp~e07d2a82708b61:
  Delete: bdb/build_win32/db_dump.dsp
BitKeeper/deleted/.del-db_java.dsp~e3941d5a9810b360:
  Delete: bdb/build_win32/db_java.dsp
BitKeeper/deleted/.del-db_load.dsp~e83a2af8e24a715d:
  Delete: bdb/build_win32/db_load.dsp
BitKeeper/deleted/.del-db_printlog.dsp~163f6e1073a5f396:
  Delete: bdb/build_win32/db_printlog.dsp
BitKeeper/deleted/.del-db_recover.dsp~835c32ab73359256:
  Delete: bdb/build_win32/db_recover.dsp
BitKeeper/deleted/.del-db_stat.dsp~f77417f5d9984986:
  Delete: bdb/build_win32/db_stat.dsp
BitKeeper/deleted/.del-db_static.dsp~78ea414467defc70:
  Delete: bdb/build_win32/db_static.dsp
BitKeeper/deleted/.del-db_tcl.dsp~5ad951d774e41520:
  Delete: bdb/build_win32/db_tcl.dsp
BitKeeper/deleted/.del-db_upgrade.dsp~90fd250190af4984:
  Delete: bdb/build_win32/db_upgrade.dsp
BitKeeper/deleted/.del-db_verify.dsp~e9a4938542f86cea:
  Delete: bdb/build_win32/db_verify.dsp
BitKeeper/deleted/.del-ex_access.dsp~8dd6017efffae14e:
  Delete: bdb/build_win32/ex_access.dsp
BitKeeper/deleted/.del-ex_btrec.dsp~c87137287d8d67dc:
  Delete: bdb/build_win32/ex_btrec.dsp
BitKeeper/deleted/.del-ex_env.dsp~1732d5e41efda77:
  Delete: bdb/build_win32/ex_env.dsp
BitKeeper/deleted/.del-ex_lock.dsp~286d2566e786dde:
  Delete: bdb/build_win32/ex_lock.dsp
BitKeeper/deleted/.del-ex_mpool.dsp~9eb937bc70c1573:
  Delete: bdb/build_win32/ex_mpool.dsp
BitKeeper/deleted/.del-ex_tpcb.dsp~644b38dae8b38152:
  Delete: bdb/build_win32/ex_tpcb.dsp
BitKeeper/deleted/.del-excxx_access.dsp~31e87b6228470681:
  Delete: bdb/build_win32/excxx_access.dsp
BitKeeper/deleted/.del-excxx_btrec.dsp~61b563f4ac1f73eb:
  Delete: bdb/build_win32/excxx_btrec.dsp
BitKeeper/deleted/.del-excxx_env.dsp~b0bf2649a4c797ac:
  Delete: bdb/build_win32/excxx_env.dsp
BitKeeper/deleted/.del-excxx_lock.dsp~257abf03544f6270:
  Delete: bdb/build_win32/excxx_lock.dsp
BitKeeper/deleted/.del-excxx_mpool.dsp~d17a5d09f09f5217:
  Delete: bdb/build_win32/excxx_mpool.dsp
BitKeeper/deleted/.del-excxx_tpcb.dsp~159c727e2c15105e:
  Delete: bdb/build_win32/excxx_tpcb.dsp
BitKeeper/deleted/.del-logtrack.list~7f4f1382b37d98e5:
  Delete: bdb/test/logtrack.list
BitKeeper/etc/ignore:
  added bdb/build_win32/db_archive.dsp bdb/build_win32/db_checkpoint.dsp bdb/build_win32/db_deadlock.dsp bdb/build_win32/db_dump.dsp bdb/build_win32/db_load.dsp bdb/build_win32/db_printlog.dsp bdb/build_win32/db_recover.dsp bdb/build_win32/db_stat.dsp bdb/build_win32/db_upgrade.dsp bdb/build_win32/db_verify.dsp bdb/build_win32/ex_access.dsp bdb/build_win32/ex_btrec.dsp bdb/build_win32/ex_env.dsp bdb/build_win32/ex_lock.dsp bdb/build_win32/ex_mpool.dsp bdb/build_win32/ex_tpcb.dsp bdb/build_win32/excxx_access.dsp bdb/build_win32/excxx_btrec.dsp bdb/build_win32/excxx_env.dsp bdb/build_win32/excxx_lock.dsp bdb/build_win32/excxx_mpool.dsp bdb/build_win32/excxx_tpcb.dsp bdb/build_win32/db_dll.dsp bdb/build_win32/db_java.dsp bdb/build_win32/db_static.dsp bdb/build_win32/db_tcl.dsp bdb/dist/template/gen_client_ret bdb/dist/template/db_server_proc bdb/include/gen_client_ext.h bdb/include/gen_server_ext.h bdb/rpc_server/db_server_proc.sed bdb/rpc_server/db_server.x bdb/test/logtrack.list
bdb/dist/s_rpc:
  This is a hack to handle the $proc_file special case.  Since it
  is both a source file and a generated file, we have to dance a
  bit to get it to work with 'bk get', not just with 'bk edit'.
  This still isn't perfect (I don't know what perfect would be in
  this case), but it seems to work for now.

Docs/manual.texi:
  Added a mirror, adjusted some URLs.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Auto merged

Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.


Docs/manual.texi:
  Added new section about crashed MyISAM tables.
  Cleaned up subsections for InnoDB
client/mysql.cc:
  Cleanup
myisam/mi_rkey.c:
  Cleanup
myisam/mi_search.c:
  Fixed wrong casts in debug messages
myisammrg/myrg_rrnd.c:
  Fixed bug when using files > 4G
mysys/getvar.c:
  Changed to use longlong to support arguments up to 4G
mysys/thr_lock.c:
  Fix for delay insert
sql/mysqld.cc:
  Increased default size for temporary tables
sql/sql_base.cc:
  Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
sql/sql_insert.cc:
  Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
sql/sql_select.cc:
  Changed that tmp_table_size =4G-1 means unlimited.

Docs/manual.texi:
  Fulltext manual changed, MERGE bug added to changelog
myisammrg/mymrgdef.h:
  MERGE bug fixed
myisammrg/myrg_rkey.c:
  MERGE bug fixed
myisammrg/myrg_rnext.c:
  MERGE bug fixed
myisammrg/myrg_rprev.c:
  MERGE bug fixed
mysql-test/r/merge.result:
  MERGE bug fixed
mysql-test/t/merge.test:
  MERGE bug fixed

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

    forgot to add result


mysql-test/r/rpl000001.result:
  forgot to add result

    added a test for updates on user table


mysql-test/t/rpl000001.test:
  added a test for updates on user table

os0file.c	Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun


innobase/os/os0file.c:
  Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun

ut0dbg.h	Changed Innobase->InnoDB
os0file.c	InnoDB prints now the number of OS error in a file operation


innobase/include/ut0dbg.h:
  Changed Innobase->InnoDB
innobase/os/os0file.c:
  More precise error message number

into threads.polyesthetic.msg:/usr/local/src/my/3

Redhat's RPM's are looking for.

Submitted by Florin Andrei <florin@sgi.com>.


support-files/mysql.spec.sh:
  Add "mysql" to the Provides: line, to match what Redhat's
  RPM's are looking for.

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

    fixed frame depth since we now are a frame deeper 
    on Alpha, use SP instead of FP



sql/stacktrace.c:
  fixed frame depth since we now are a frame deeper 
  on Alpha, use SP instead of FP

innobase/row/row0undo.c:
  Fix a bug if we run out of space in the tablespace assertion in trx0roll.c

into threads.polyesthetic.msg:/usr/local/src/my/3


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged

configure.in	Check if fdatasync exists
manual.texi	Updated defragmenting doc
manual.texi	Corrected fillfactor contract threashold for a page to 1/2


Docs/manual.texi:
  Updated defragmenting doc
innobase/configure.in:
  Check if fdatasync exists
innobase/os/os0file.c:
  Use O_SYNC if possible, second choice fdatasync, and last choice fsync

Docs/manual.texi:
  Auto merged

Updated qsort source from glibc.
Add debugging of keycache when EXTRA_DEBUG is specified


Docs/manual.texi:
  Added new contrib stuff
bdb/dist/Makefile.in:
  Don't automaticly checkout things from bk
mysys/mf_keycache.c:
  Add debugging of keycache when EXTRA_DEBUG is specified.
mysys/mf_qsort.c:
  Updated qsort source from glibc.
sql/Makefile.am:
  Cleanup up stacktrace code
sql/mysqld.cc:
  Cleanup up stacktrace code

manual.texi	book errata.


Docs/manual.texi:
  changed location of samp_db distribution and MySQL
  book errata.

sql/mysqld.cc:
  Fixes for Alpha cc compiler
support-files/my-huge.cnf.sh:
  cleanup
support-files/my-large.cnf.sh:
  cleanup
support-files/my-medium.cnf.sh:
  cleanup
support-files/my-small.cnf.sh:
  cleanup

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Updated gdb / trace information
innobase/pars/pars0grm.c:
  Removed warning on windows
mysys/mf_keycache.c:
  Changed "exec" to "check_keycache"
sql/mysqld.cc:
  Added suffix for windows binaries

Docs/manual.texi:
  Added a note on table defragmenting and a sentence on InnoDB speed

    put back the things that the merge removed


sql/mysqld.cc:
  put back the things that the merge removed