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

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

sql/mysqld.cc:
  merged - need to fix

limited support on Alpha - in general case, even with frame pointer,
stack trace on alpha is impossible without looking at the symbol table
frame pointer does get saved on the stack, but you have no idea where
and where the return address is saved. So the best we can do without
the symbol table is look for magic opcodes and try to guess how big 
each frame is and where the return address was hidden from the 
instruction parameters. In practice, we can usually go up 3-4 frames 
before we hit some nasty frame that the current code cannot figure
out. This is actually not too bad, especially when we already have the query

Also cleaned up messages, print more variables, tell the user of
how much memory mysqld could potentially use, and warn of
what can happen with default STACK_SIZE and a lot of connections if
coredump happens when there are more than 200 connections. 


sql/mysqld.cc:
  stack trace updates

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

innobase/row/row0sel.c:
  Fix a bug in consistent read through secondary key

Docs/manual.texi:
  Auto merged

Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB


Docs/manual.texi:
  Changelog + update of table types
bdb/include/log.h:
  Patch from Sleepycat
bdb/log/log.c:
  Patch from Sleepycat
bdb/log/log_rec.c:
  Patch from Sleepycat
client/mysqladmin.c:
  Cleanup
innobase/include/univ.i:
  Fix for compilation on Windows
innobase/os/os0file.c:
  cleanup
innobase/pars/pars0grm.y:
  Fix for compilation on Windows
mysql-test/r/innodb.result:
  New test case
mysql-test/t/innodb.test:
  New test case
sql/ha_innobase.cc:
  cleanup
sql/ha_innobase.h:
  Fix for prefix keys
sql/handler.h:
  Fix for temporary Innodb tables
sql/item_strfunc.cc:
  Fixed bug in REPLACE()
sql/lock.cc:
  Fix for temporary Innodb tables
sql/mysqld.cc:
  Added --skip-stack-trace
sql/share/english/errmsg.txt:
  Better error messages
sql/sql_base.cc:
  Fix for temporary Innodb tables
sql/sql_select.cc:
  Fix for temporary Innodb tables
sql/sql_table.cc:
  Fixed sub char keys for InnoDB
sql/table.h:
  Fix for temporary Innodb tables

    removed porn site



Docs/manual.texi:
  removed porn site

sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged

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

Docs/manual.texi:
  Fixed a typo in InnoDB record size

    added reference to htCheck, and removed some broken links (incidentally, found by htCheck)


Docs/manual.texi:
  added reference to htCheck, and removed some broken links (incidentally, found by htCheck)

sql/mini_client.cc:
  pass along ER_NET_PACKET_TOO_LARGE
sql/slave.cc:
  better error message when the packet is too large in slave thread

    fixed bug
sql/sql_repl.cc
    undid virtual master change



Docs/manual.texi:
  fixed bug
sql/sql_repl.cc:
  undid virtual master change

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