Docs/manual.texi:
  merged melissa spurr's newest edits into the manual.

Docs/manual.texi:
  NuSphere editor's changes to pages 151-200.

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

Docs/manual.texi:
  NuSphere editor's changes to pages 101-150.

Docs/manual.texi:
  Fix typo

sql-bench/Results/ATIS-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/create-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/select-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  new benchmark results
sql/mysqld.cc:
  Bigger ranges if set_maximum_open_files fails

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


Docs/manual.texi:
  Auto merged

Sucks when you have to do it the manual way.  bk diffs, patch, xemacs.


Docs/manual.texi:
  Added the first of Melissa Spurr's (NuSphere's) index additions in.

scripts/mysql_install_db.sh:
  Added missing variable

include/config-win.h:
  Increase the number of files on windows
include/mysys_err.h:
  New error message
myisam/mi_log.c:
  Fix myisam.log to be usable even if we are using NFS
myisam/myisamdef.h:
  Fix myisam.log to be usable even if we are using NFS
mysys/errors.c:
  Fix error message

  PDF Manual now has Indexes.
Docs/manual.texi:
  Added stub and conditionals for removing GPL and LGPL from NuSphere
  manual.


Docs/Makefile.am:
  PDF Manual now has Indexes
Docs/manual.texi:
  Added stub and conditionals for removing GPL and LGPL from NuSphere
  manual.

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Update of file limits on windows
myisam/mi_close.c:
  Fix for alter table on windows
myisam/mi_extra.c:
  Fix for alter table on windows
myisam/myisamlog.c:
  Corrected statistics information
sql-bench/limits/mysql-3.23.cfg:
  Update to new crash-me
sql-bench/limits/mysql.cfg:
  Update to new crash-me
sql/sql_base.cc:
  Fix if end of memory
sql/table.cc:
  Fix of new introduced index-handling bug

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


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added ValueClick mirror.

BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Merge

Docs/manual.texi:
  Changelog and small fixes
mysys/my_init.c:
  Changed UMASK and UMASK_DIR to work also with octal
scripts/mysqlhotcopy.sh:
  Fixed some small bugs
sql/share/swedish/errmsg.OLD:
  Fixed wrong entry
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

reading from FIFO, fixes for FULLTEXT, @@IDENTITY


Docs/manual.texi:
  Update of RIGHT JOIN
client/mysql.cc:
  Faster HTML generation
extra/perror.c:
  Added MyISAM error messages
include/my_base.h:
  Update for automatic repair of MyISAM tables
include/my_sys.h:
  Backup files and FIFO
include/myisam.h:
  Automatic repair and backup files
include/mysqld_error.h:
  New error message
myisam/mi_check.c:
  Update for automatic repair of MyISAM tables
myisam/mi_locking.c:
  Fixed comment
myisam/mi_open.c:
  Update for automatic repair of MyISAM tables
myisam/myisamchk.c:
  Update for automatic repair of MyISAM tables
myisam/myisamdef.h:
  Update for automatic repair of MyISAM tables
mysys/mf_getdate.c:
  Added new parameter option for backup files
mysys/my_open.c:
  Added debug information
mysys/my_redel.c:
  Backup file handling
sql/ha_berkeley.cc:
  Updated interface
sql/ha_berkeley.h:
  Updated interface
sql/ha_heap.cc:
  Updated interface
sql/ha_heap.h:
  Updated interface
sql/ha_isam.cc:
  Updated interface
sql/ha_isam.h:
  Updated interface
sql/ha_isammrg.cc:
  Updated interface
sql/ha_isammrg.h:
  Updated interface
sql/ha_myisam.cc:
  Update for automatic repair of MyISAM tables
sql/ha_myisam.h:
  Updated interface
sql/ha_myisammrg.cc:
  Updated interface
sql/ha_myisammrg.h:
  Updated interface
sql/handler.h:
  Updated interface
sql/item.h:
  Added @@identity
sql/item_func.cc:
  Added @@identity
sql/lex.h:
  Added RIGHT JOIN
sql/mf_iocache.cc:
  Update for reading from FIFO
sql/mysqld.cc:
  Update for automatic repair of MyISAM tables
sql/share/czech/errmsg.sys:
  Added @@identity
sql/share/czech/errmsg.txt:
  Added @@identity
sql/share/danish/errmsg.sys:
  Added @@identity
sql/share/danish/errmsg.txt:
  Added @@identity
sql/share/dutch/errmsg.sys:
  Added @@identity
sql/share/dutch/errmsg.txt:
  Added @@identity
sql/share/english/errmsg.sys:
  Added @@identity
sql/share/english/errmsg.txt:
  Added @@identity
sql/share/estonian/errmsg.sys:
  Added @@identity
sql/share/estonian/errmsg.txt:
  Added @@identity
sql/share/french/errmsg.sys:
  Added @@identity
sql/share/french/errmsg.txt:
  Added @@identity
sql/share/german/errmsg.sys:
  Added @@identity
sql/share/german/errmsg.txt:
  Added @@identity
sql/share/greek/errmsg.sys:
  Added @@identity
sql/share/greek/errmsg.txt:
  Added @@identity
sql/share/hungarian/errmsg.sys:
  Added @@identity
sql/share/hungarian/errmsg.txt:
  Added @@identity
sql/share/italian/errmsg.sys:
  Added @@identity
sql/share/italian/errmsg.txt:
  Added @@identity
sql/share/japanese/errmsg.sys:
  Added @@identity
sql/share/japanese/errmsg.txt:
  Added @@identity
sql/share/korean/errmsg.sys:
  Added @@identity
sql/share/korean/errmsg.txt:
  Added @@identity
sql/share/norwegian-ny/errmsg.txt:
  Added @@identity
sql/share/norwegian/errmsg.txt:
  Added @@identity
sql/share/polish/errmsg.sys:
  Added @@identity
sql/share/polish/errmsg.txt:
  Added @@identity
sql/share/portuguese/errmsg.sys:
  Added @@identity
sql/share/portuguese/errmsg.txt:
  Added @@identity
sql/share/romanian/errmsg.txt:
  Added @@identity
sql/share/russian/errmsg.sys:
  Added @@identity
sql/share/russian/errmsg.txt:
  Added @@identity
sql/share/slovak/errmsg.sys:
  Added @@identity
sql/share/slovak/errmsg.txt:
  Added @@identity
sql/share/spanish/errmsg.sys:
  Added @@identity
sql/share/spanish/errmsg.txt:
  Added @@identity
sql/share/swedish/errmsg.OLD:
  Added @@identity
sql/share/swedish/errmsg.sys:
  Added @@identity
sql/share/swedish/errmsg.txt:
  Added @@identity
sql/sql_base.cc:
  Fix for RIGHT JOIN
sql/sql_db.cc:
  Update for automatic repair of MyISAM tables
sql/sql_load.cc:
  Added reading from FIFO
sql/sql_parse.cc:
  Fix for RIGHT JOIN
sql/sql_select.cc:
  Fix for RIGHT JOIN
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Added RIGHT JOIN
sql/table.cc:
  Fix handling of FULLTEXT index
sql/table.h:
  Added RIGHT JOIN
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Reactivated sote.hu mirror.

Docs/manual.texi:
  Reactivated sopik.cz mirror.

Docs/manual.texi:
  Reactivated directnet.ru and psinet.cl mirrors.

configure.in	the & in 2>&1 gets replaced by sed during AC_SUBST


configure.in:
  the & in 2>&1 gets replaced by sed during AC_SUBST
scripts/safe_mysqld.sh:
  remove stray warning message from nohup nice

configure.in:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
scripts/safe_mysqld.sh:
  merge nohup_niceness changes

Docs/manual.texi:
  NuSphere editor's changes to pages 65-100.

Docs/manual.texi:
  NuSphere editor's changes to pages 18-64.

into main.burghcom.com:/usr/home/nusphere/bk/mysql


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

Docs/manual.texi:
  Reactivated paco.net mirror.

Docs/manual.texi:
  Cotton pickin bk! Let me push this!!

    added updated for FLUSH LOGS and replication
sql/log.cc
    fixed the log rotation bug when the log name did not change after
    FLUSH LOGS


Docs/manual.texi:
  added updated for FLUSH LOGS and replication
sql/log.cc:
  fixed the log rotation bug when the log name did not change after
  FLUSH LOGS
sql/sql_class.h:
  fixed the log rotation bug when the log name did not change after
  FLUSH LOGS

Docs/manual.texi:
  Updated changelog
client/mysql.cc:
  Free all memory, even if we can't connect to the server
include/config-win.h:
  Ensure that we don't use SAFE_MUTEX on windows
include/my_pthread.h:
  Optimze struct for Ia64
include/myisam.h:
  Hack for debugging BIG tables
myisam/mi_check.c:
  Hack for debugging BIG tables
myisam/mi_search.c:
  Fixed bug in packed keys
myisam/myisamchk.c:
  Hack for debugging BIG tables
mysys/thr_mutex.c:
  Make safe_mutex safe for windows
scripts/safe_mysqld.sh:
  Fix nice test and echo output
sql/share/Makefile.am:
  Fix character sets
sql/sql_string.cc:
  Fixes for AIX (which can't handle that the length argument is 0)

Docs/manual.texi:
  Auto merged

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:
  Fixed typos in mirror listing.

into nslinux.bedford.progress.com:/users/devp/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Reactivated some mirrors.

Docs/manual.texi:
  Changed a Unix to UNIX.. testing bk from NuSphere
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted