Docs/manual.texi:
  Fix for release
include/my_pthread.h:
  Fix for SAFE_MUTEX for windows
include/myisammrg.h:
  Fix for empty MERGE tables
myisam/ft_stopwords.c:
  Free used memory
myisammrg/myrg_open.c:
  Fix for empty MERGE tables
myisammrg/myrg_queue.c:
  Fix for empty MERGE tables
myisammrg/myrg_rfirst.c:
  cleanup
myisammrg/myrg_rkey.c:
  cleanup
mysys/my_thr_init.c:
  Fix SAFE_MUTEX for windows
mysys/my_winthread.c:
  Fix SAFE_MUTEX for windows
mysys/thr_mutex.c:
  Fix SAFE_MUTEX for windows
sql/ha_myisammrg.cc:
  Fix for empty MERGE tables
sql/mysqld.cc:
  Fix type

Docs/manual.texi:
  cleanup
include/my_pthread.h:
  Fix for SAFEMUTEX under windows
mysys/my_thr_init.c:
  Fix for SAFEMUTEX under windows
mysys/my_winthread.c:
  Fix for SAFEMUTEX under windows
mysys/thr_mutex.c:
  Fix for SAFEMUTEX under windows
sql/mysqld.cc:
  Remove unused code
sql/sql_table.cc:
  Fix filename comparison on Windows
support-files/Makefile.am:
  Added magic file

into tetra.bedford.progress.com:/usr/home/jcole/bk/mysql


configure.in:
  Auto merged

configure.in:
  removed comma, wasn't supposed to be there, causing problems ;)

acinclude.m4:
  Small fix of alignment.
configure.in:
  Lots of fixes of alignment.. made help output nice and pretty.

mysys/mf_format.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

Docs/manual.texi:
  Change log + bug fixes from the mailing list
configure.in:
  added mlockall
include/config-win.h:
  Fix to use SAFE_MUTEX
include/ft_global.h:
  Free memory
include/my_pthread.h:
  Fix for SAFE_MUTEX on windows
myisam/Makefile.am:
  Fix modes
myisam/ft_static.c:
  Fix language problem with fulltext
myisam/ft_stopwords.c:
  Free memory at end
myisam/mi_create.c:
  Fix language problem with fulltext
myisam/mi_delete.c:
  Added optimization to not join blocks when using delete with QUICK
myisam/mi_panic.c:
  Added freeing of memorty
myisam/mi_test2.c:
  Added quick mode
myisam/myisamchk.c:
  Fixed help text
myisam/myisamdef.h:
  Added optimization to not join blocks when using delete with QUICK
mysys/mf_format.c:
  Don't change case for extension
mysys/my_wincond.c:
  Fix for safe mutex
mysys/thr_mutex.c:
  Fix for safe mutex
sql-bench/test-insert.sh:
  Split delete test to get more information about the times
sql/ChangeLog:
  Changelog
sql/ha_myisam.cc:
  Better OPTIMIZE handling
sql/log.cc:
  Cleanup
sql/mysql_priv.h:
  Fix for safe mutex
sql/mysqld.cc:
  Added define for --one-thread option
sql/sql_class.h:
  Fixed lock_time in slow_log
sql/sql_delete.cc:
  Fix for safe mutex
sql/sql_parse.cc:
  Fix processlist message for new process
sql/sql_table.cc:
  Fix windows problem med CREATE INDEX
sql/sql_yacc.yy:
  Fix for safe mutex
sql/table.cc:
  Made code simpler
strings/bmove512.c:
  Small speed fix
support-files/mysql.server.sh:
  Fixed awk usage

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

    fixed typo in the error message
sql/sql_base.cc
    fixed bugs in reopen_name_locked_table() after talking to Monty

added a test case for restore + select


sql/slave.cc:
  fixed typo in the error message
sql/sql_base.cc:
  fixed bugs in reopen_name_locked_table() after talking to Monty

Docs/manual.texi:
  Goofed image comments, fixed now.

manual.texi	a better way to integrate into Gizmo.


Docs/manual.texi:
  Commented out mirror flag images, until we find
  a better way to integrate into Gizmo.

changed RESTORE TABLE to use name lock


sql/mysql_priv.h:
  added reopen_name_locked_table()
sql/sql_base.cc:
  added reopen_name_locked_table()
sql/sql_table.cc:
  fixed repare_for_restore() to use fn_format() power
  changed RESTORE TABLE to use name lock

manual.texi	non-existent sites (sent mail to maintainers).


Docs/manual.texi:
  Updated all mirror sites, removing out of date or
  non-existent sites (sent mail to maintainers).

BitKeeper/etc/logging_ok:
  fixed after matt removed all of us ;)

Docs/Makefile.am:
  removed print-manual.pdf
  added nusphere.pdf
Docs/manual.texi:
  cleaned up the header a bit
  added conditionals for nusphere.pdf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

fixed buffer overflow in fn_format()


mysys/mf_format.c:
  fixed coredump when dsk overflows
sql/ha_myisam.cc:
  switched from my own pointer black magic in forming a file name to use
  the functionionality of fn_format()

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


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

run-all-tests for replication


client/mysql-test.c:
  ***MISSING WEAVE***

Docs/manual.texi:
  Forgot mailing lists and links to order support in the Contact section.

manual.texi	machine can be plugged back in now. :)


Docs/manual.texi:
  Updated the Contact Us information. David's answering
  machine can be plugged back in now. :)

logging_ok	Logging to logging@openlogging.org accepted


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  Hyper-linked mailing list address.

Docs/manual.texi:
  Changed book URLs to barnesandnoble.com.

Docs/manual.texi:
  Fixups to recent change notes.

Docs/manual.texi:
  fixed bad reference
sql/sql_lex.h:
  removed wrongly added backup_dir

Docs/manual.texi:
  Added changes lost during bk resolve

sql/sql_lex.h:
  Auto merged
Docs/manual.texi:
  merged/resolved conflicts

    Updates for BACKUP TABLE/RESTORE TABLE
    Added Replication FAQ
    Cleaned up TODO list removing a duplicate and features already implemented
    Updated changelog for 3.23.25
sql/sql_lex.h
    Re-added backup_dir to Lex which dispappeared while resovling conflicts


Docs/manual.texi:
  Updates for BACKUP TABLE/RESTORE TABLE
  Added Replication FAQ
  Cleaned up TODO list removing a duplicate and features already implemented
  Updated changelog for 3.23.25
sql/sql_lex.h:
  Re-added backup_dir to Lex which dispappeared while resovling conflicts

include/myisam.h:
  Don't assume too big tempoary disks
myisam/mi_check.c:
  Don't assume too big tempoary disks
myisam/mi_static.c:
  Don't assume too big tempoary disks
myisam/myisamdef.h:
  Fix type
sql/ha_myisam.cc:
  Set myisamchk to use MySQL temporary disk space
sql/slave.cc:
  Fix parameters
sql/sql_lex.h:
  Added backup_dir

Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BUILD/compile-alpha-ccc:
  remove deps to get things to compile better
Docs/manual.texi:
  Small fixes
configure.in:
  Fix for mlockmem()
include/my_sys.h:
  Made key_cache_inited global
myisammrg/myrg_close.c:
  Fixed memory leak
myisammrg/myrg_open.c:
  Initialize queue to avoid memory leak bug
mysys/mf_format.c:
  Added overflow check
mysys/mf_keycache.c:
  Made key_cache_init more secure to use
mysys/my_static.h:
  Make key_cache_inite global
sql/ChangeLog:
  Changes
sql/lock.cc:
  Added logging of locktime
sql/log.cc:
  Added logging of locktime
sql/mysql_priv.h:
  Added locked_in_memory
sql/mysqld.cc:
  Added logging of locktime + locked in memory
sql/sql_acl.cc:
  Added thd to log::write() for faster call
sql/sql_base.cc:
  Use global key_cache variable
sql/sql_class.cc:
  Added result row counting
sql/sql_class.h:
  Added thd to log::write() for faster call
sql/sql_db.cc:
  Added thd to log::write() for faster call
sql/sql_delete.cc:
  Added thd to log::write() for faster call
sql/sql_insert.cc:
  Added thd to log::write() for faster call
sql/sql_load.cc:
  Added thd to log::write() for faster call
sql/sql_parse.cc:
  Added thd to log::write() for faster call
sql/sql_rename.cc:
  Added thd to log::write() for faster call
sql/sql_table.cc:
  Added thd to log::write() for faster call
sql/sql_update.cc:
  Added thd to log::write() for faster call

sql/ha_myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/handler.h:
  Added a comment

  FULLTEXT doesn't actually work with BLOBs.


Docs/manual.texi:
  FULLTEXT doesn't actually work with BLOBs.

RESTORE TABLE FROM 'directory'
log on slave when it connects to the master


include/mysql_com.h:
  Added COM_CONNECT_OUT so we can log on the slave when 
  connects to the master
sql/ha_myisam.cc:
  added restore() and backup()
sql/ha_myisam.h:
  Added restore() and backup()
sql/handler.cc:
  restore()/backup()
sql/handler.h:
  restore()/backup()
sql/lex.h:
  BACKUP/RESTORE
sql/mysql_priv.h:
  gave global ( non-static) scope to generate_table()
  added mysql_backup_table()/mysql_restore_table()
sql/slave.cc:
  Log when slave connects to the master on the slave
sql/sql_delete.cc:
  changed the scope of generate_table() from static to global
sql/sql_lex.h:
  changes for BACKUP TABLE/RESTORE TABLE
sql/sql_parse.cc:
  Changes for BACKUP TABLE/RESTORE TABLE
sql/sql_table.cc:
  Changes for BACKUP TABLE/RESTORE TABLE
sql/sql_yacc.yy:
  BACKUP TABLE/ RESTORE TABLE

scripts/make_binary_distribution.sh:
  Change mode to -rw-rw-r--
scripts/mysql_convert_table_format.sh:
  Change mode to -rw-rw-r--
scripts/mysql_find_rows.sh:
  Change mode to -rw-rw-r--
scripts/mysql_setpermission.sh:
  Change mode to -rw-rw-r--
scripts/mysql_zap.sh:
  Change mode to -rw-rw-r--
scripts/mysqlaccess.sh:
  Change mode to -rw-rw-r--
scripts/mysqlbug.sh:
  Change mode to -rw-rw-r--
scripts/mysqlhotcopy.sh:
  Change mode to -rw-rw-r--
scripts/safe_mysqld-watch.sh:
  Change mode to -rw-rw-r--
scripts/safe_mysqld.sh:
  Change mode to -rw-rw-r--
scripts/mysqlaccess.conf:
  Change mode to -rw-rw-r--
support-files/binary-configure.sh:
  Change mode to -rw-rw-r--
Docs/Makefile.am:
  Remove manual.ps when doing make distclean
Docs/manual.texi:
  Fix
Makefile.am:
  Fix that my_config.h is properly created and removed
include/Makefile.am:
  Fix that my_config.h is properly created and removed
libmysql/Makefile.shared:
  Add some distclean targets
scripts/Makefile.am:
  Add some distclean targets
support-files/Makefile.am:
  Add some distclean targets

into ham.spaceapes.com:/usr/home/jcole/bk/mysql

be wrong and install would fail.


sql/share/Makefile.am:
  When installing, should cd into the directory where the files 
  are coming from.  This caused a problem with one of our customers
  using an SGI IRIX machine, I'd guess that IRIX uses some version
  of install that doesn't disregard the path of the source file
  when copying the files.