Docs/manual.texi:
  Added uklinux.net mirror.

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


sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

sql_repl.* will push this one, since the replication code now works


repl-tests/test-dump/run.test:
  added slave/master reset
sql/Makefile.am:
  added sql_repl.*
sql/log_event.cc:
  moved #defines to log_event.h
sql/log_event.h:
  moved #defines from log_event.cc
sql/mysql_priv.h:
  added LOCK_server_id
sql/mysqlbinlog.cc:
  added server id
sql/mysqld.cc:
  added mutex_init for LOCK_server_id
sql/slave.cc:
  added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
  moved replication code to sql_repl.*
sql/sql_parse.cc:
  moved replication code to sql_repl.*

for the patch.


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

GOMEZ Henri <hgomez@slib.fr> for the patch.


support-files/mysql.spec.sh:
  handle compressed man/info docs

sql/mysqld.cc:
  merged changes

added server id, mostly working
added --skip-slave-start, working
added --replicate-rewrite-db - just in the cmd line parses, currently noop


sql/log_event.cc:
  added server id
sql/log_event.h:
  added server id
sql/mysql_priv.h:
  server id
sql/mysqlbinlog.cc:
  server id
sql/mysqld.cc:
  server id, --skip-slave-start, --replicate-rewrite-db
sql/share/romanian/errmsg.sys:
  somehow got touched and bk thinks it is modified
sql/slave.cc:
  server id, fixed typo in error message, cleaned up
sql/sql_class.cc:
  server id in THD
sql/sql_class.h:
  server id in THD

Docs/manual.texi:
  Auto merged

in FULLTEXT indexes.


Docs/manual.texi:
  Removed some @ifset nushere tags which crashed the manual
  when using emacs
client/mysql-test.c:
  ***MISSING WEAVE***
heap/hp_test2.c:
  Removed compiler warnings
isam/pack_isam.c:
  Removed compiler warnings
isam/update.c:
  Removed compiler warnings
myisam/ft_parser.c:
  cleanup
myisam/ft_update.c:
  Fixed crash when inserting a blob which was NULL
myisam/mi_check.c:
  -e continues checking of other keys on error
myisam/mi_rkey.c:
  cleanup
myisam/myisamchk.c:
  cleanup
myisam/myisamlog.c:
  Added use of rnd to make things more predictable
myisammrg/myrg_rkey.c:
  Removed compiler warnings
mysys/mf_pack.c:
  cleanup
mysys/my_fstream.c:
  cleanup
sql/ha_berkeley.cc:
  cleanup
sql/handler.cc:
  cleanup
sql/item_func.cc:
  cleanup
sql/item_func.h:
  cleanup
sql/net_serv.cc:
  cleanup
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  cleanup
sql/sql_show.cc:
  cleanup

Docs/manual.texi:
  Put the Contents at the beginning like a normal book.

Docs/manual.texi:
  Fixed Melissa Spurr's Texinfo Typos.

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