Docs/manual.texi:
  Updated MERGE table stuff + more
extra/perror.c:
  Added missing error messages
include/myisammrg.h:
  Fixes for MERGE TABLE
include/queues.h:
  Fixes for MERGE TABLE
isam/isamlog.c:
  Fixed hard bug
myisam/mi_log.c:
  cleanup
myisam/mi_open.c:
  Fixed file name format in myisam log
myisam/myisamlog.c:
  Bug fixes
myisammrg/mymrgdef.h:
  Fixes for MERGE TABLE
myisammrg/myrg_create.c:
  Fixes for MERGE TABLE
myisammrg/myrg_open.c:
  Fixes for MERGE TABLE
myisammrg/myrg_queue.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rfirst.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rkey.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rlast.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rnext.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rprev.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rrnd.c:
  Fixes for MERGE TABLE
mysql.proj:
  update
mysys/queues.c:
  Fixed bug when using reverse queues
sql-bench/test-insert.sh:
  Separated some things to get better timings
sql/ha_heap.cc:
  Fixed heap table bug
sql/ha_heap.h:
  Fixed heap table bug
sql/ha_myisam.h:
  Fixed wrong max_keys
sql/ha_myisammrg.cc:
  Fixed MERGE TABLES
sql/ha_myisammrg.h:
  Fixed MERGE TABLES
sql/handler.h:
  Fix for MERGE TABLES and HEAP tables
sql/lex.h:
  Fixed MERGE TABLES
sql/mysql_priv.h:
  Cleanup of code
sql/sql_acl.cc:
  Fixed that privilege tables are flushed at start
sql/sql_lex.h:
  Fixed MERGE TABLES
sql/sql_parse.cc:
  Fixed MERGE TABLES
sql/sql_select.cc:
  Fixes for HEAP tables
sql/sql_table.cc:
  Cleanup
sql/sql_yacc.yy:
  Fixed MERGE TABLES

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Update of Linux notes and mysql_install_db
include/my_tree.h:
  new tree function
myisam/ft_parser.c:
  Fix free() bug
myisam/ft_search.c:
  Fix free() bug
myisam/ft_update.c:
  Fix free() bug
scripts/safe_mysqld.sh:
  Check if we run as root
sql-bench/Results-linux/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/ATIS-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/create-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/select-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha:
  ***MISSING WEAVE***
sql-bench/server-cfg.sh:
  Added use of OPTIMIZE TABLE
sql-bench/test-ATIS.sh:
  Added use of OPTIMIZE TABLE
sql-bench/test-insert.sh:
  Added use of OPTIMIZE TABLE
sql-bench/test-select.sh:
  Added use of OPTIMIZE TABLE
sql-bench/test-wisconsin.sh:
  Added use of OPTIMIZE TABLE
sql/field.cc:
  Fix TIME type
sql/item_func.h:
  Fixed Free bug

Docs/manual.texi:
  Technical edit of first half.
  Fixed some ugly tables.
  Typo, english, and spelling corrections.

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

Docs/manual.texi:
  Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE...
client/mysqladmin.c:
  Fixed bug with pid-file handling.
client/mysqldump.c:
  Version change
configure.in:
  Version change
include/Makefile.am:
  Fix for SCO to get sched.h removed.
include/global.h:
  Increased MY_NFILE;  Added thread_safe_increment
include/my_sys.h:
  Better root_alloc
include/mysql.h:
  Better root_alloc
include/mysys_err.h:
  Fix for PREAD/PWRITE on windows
libmysql/libmysql.c:
  Better root_alloc
myisam/mi_locking.c:
  Fix for PREAD/PWRITE on windows
myisam/mi_static.c:
  Fix for PREAD/PWRITE on windows
mysys/default.c:
  Better root_alloc
mysys/errors.c:
  Fix for PREAD/PWRITE on windows
mysys/my_alloc.c:
  Better root_alloc
mysys/my_create.c:
  Fix for PREAD/PWRITE on windows
mysys/my_fopen.c:
  Fix for PREAD/PWRITE on windows
mysys/my_open.c:
  Fix for PREAD/PWRITE on windows
mysys/my_pread.c:
  Fix for PREAD/PWRITE on windows
mysys/tree.c:
  Better root_alloc
readline/bind.c:
  Removed compiler warning
readline/isearch.c:
  Removed compiler warning
scripts/safe_mysqld.sh:
  Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT
sql-bench/crash-me.sh:
  Version change
sql-bench/limits/mysql-3.23.cfg:
  Update to latest MySQL version
sql/filesort.cc:
  Added more statistics
sql/ha_berkeley.h:
  Fixed bug with ORDER BY
sql/ha_myisam.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/ha_myisam.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/item_func.cc:
  Fixed comment
sql/item_timefunc.cc:
  Fixed possible month bug
sql/mini_client.cc:
  Use of new root_alloc
sql/mysql_priv.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/mysqld.cc:
  Added more statistics
sql/opt_range.cc:
  Use of new root_alloc
sql/slave.cc:
  Use of new root_alloc
sql/sql_acl.cc:
  Use of new root_alloc
sql/sql_class.cc:
  Use of new root_alloc
sql/sql_parse.cc:
  Use of new root_alloc
sql/sql_select.cc:
  Added more statistics
sql/sql_table.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/sql_udf.cc:
  Use of new root_alloc
sql/sql_yacc.yy:
  Fixed that OPTIMIZE TABLE can take many tables as arguments
sql/table.cc:
  Use of new root_alloc
sql/thr_malloc.cc:
  Use of new root_alloc
support-files/mysql.server.sh:
  Removed usage of AWK

manual.texi	Changed instance of "data is" to "data are" (the
manual.texi	manual generally treats data as a plural word).


Docs/manual.texi:
  Fixups for recent change notes.
  Changed instance of "data is" to "data are" (the
  manual generally treats data as a plural word).

into central.snake.net:/usr/users/paul/mysql


Docs/manual.texi:
  Auto merged

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

masterless


sql/slave.cc:
  fixed coredump in CHANGE MASTER TO
sql/sql_parse.cc:
  fixed coredump in CHANGE MASTER TO

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  blank page after title page

chow -> show


Docs/manual.texi:
  Monty: chow -> show

into central.snake.net:/usr/users/paul/mysql


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

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

Build-tools/Do-all-build-steps:
  Fixed type in chmod
scripts/make_binary_distribution.sh:
  All libmysqlclient_r files wheren't included

Build-tools/Do-compile:
  Fixed missing --no-defaults
scripts/mysql_install_db.sh:
  Fixed --no-defaults

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


Docs/manual.texi:
  Auto merged

manual.texi	@code{MySQL} -> @strong{MySQL}
manual.texi	MacOS -> Mac OS, MacOSX -> Mac OS X (except in
manual.texi	one place where it's the title of someone else's
manual.texi	Web page)


Docs/manual.texi:
  API's -> APIs
  @code{MySQL} -> @strong{MySQL}
  MacOS -> Mac OS, MacOSX -> MacOS X (except in
  one place where it's the title of someone else'ss
  Web page)

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

Docs/manual.texi:
  Portability updates, user addition and changelog for 3.23.24
mysys/thr_rwlock.c:
  Portability fix
scripts/make_binary_distribution.sh:
  Added use of sbindir
scripts/mysql_install_db.sh:
  Fixed usage of defaults files
sql/ha_myisam.cc:
  Cleanup
sql/sql_base.cc:
  Cleanup

Docs/internals.texi:
  Rewrite from pseudo-texi to real texi. :)

Build-tools/Do-all-build-steps:
  Fix privileges for tables
Build-tools/Do-patch-file:
  Fix for move to bk

Docs/manual.texi:
  Update for 3.23.24
sql/mysql_priv.h:
  Added create_tmp_disk_tables
sql/mysqld.cc:
  Added create_tmp_disk_tables
sql/sql_select.cc:
  Added create_tmp_disk_tables

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged

support-files/mysql.server-sys5.sh:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  Added information about BeOS, Access 2000, AIX and user links
client/mysql.cc:
  Fixed SOURCE to work on windows
client/mysqldump.c:
  Strip of white space
configure.in:
  Fix for AIX
include/dbug.h:
  Assert handling
include/my_pthread.h:
  Ia64 needs more thread stack than other processors
include/my_sys.h:
  More comments
myisam/mi_key.c:
  Fixed wrong key length checks
mysql.proj:
  update
mysys/charset.c:
  Cleanup
mysys/mf_keycache.c:
  Moved SEC_LINK to file that used it
mysys/my_static.h:
  Moved SEC_LINK to file that used it
scripts/Makefile.am:
  Fix for debian
scripts/mysql_install_db.sh:
  Cleanup
sql/gen_lex_hash.cc:
  Better values
sql/ha_berkeley.cc:
  Fix of reading of unique key
sql/handler.cc:
  Fix memory allocation bug
sql/mysqld.cc:
  Fix for Ia64
sql/share/charsets/latin1.conf:
  Fixed sortorder back to scandinavian.
sql/sql_yacc.yy:
  FULL shouldn't be a keyword
support-files/Makefile.am:
  Fix for debian
support-files/mysql.server.sh:
  Cleanups

Docs/Makefile.am:
  Added target for printed manual pdf.

  Latest grammatical and spelling corrections.
  Amended/corrected install instructions.


Docs/manual.texi:
  Latest grammatical and spelling corrections.
  Amended/corrected install instructions.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  - merge changes
configure.in:
  - merge changes
sql/share/charsets/Index:
  - merge changes
sql/share/charsets/win1251.conf:
  - merge changes

Docs/manual.texi:
  - win1251 is deprecated

configure.in:
  don't remove win1251, but mark it deprecated

sql/mysqld.cc:
  Making 80-column displays a little happier.

Build-tools/Do-compile:
  Auto merged
client/mysqldump.c:
  Aborted Serges patch as this would have caused incompatibility
  problems with old MySQL servers.

Build-tools/Do-compile:
  Fixes for remote build
Docs/manual.texi:
  Mainly updates for Access 2000
client/mysqldump.c:
  Added quoting of TIMESTAMP columns
include/mysql.h:
  Added quoting of TIMESTAMP columns
include/mysql_com.h:
  Added quoting of TIMESTAMP columns
libmysql/libmysql.c:
  Added quoting of TIMESTAMP columns
scripts/mysql_install_db.sh:
  Fixed http address
sql-bench/Results/ATIS-mysql-NT_4.0:
  New test results
sql-bench/Results/RUN-mysql-NT_4.0:
  New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New test results
sql-bench/Results/connect-mysql-NT_4.0:
  New test results
sql-bench/Results/create-mysql-NT_4.0:
  New test results
sql-bench/Results/insert-mysql-NT_4.0:
  New test results
sql-bench/Results/select-mysql-NT_4.0:
  New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New test results
sql/ChangeLog:
  Changelog
sql/field.h:
  Added quoting of TIMESTAMP columns
sql/mysql_priv.h:
  Optimizing
sql/mysqld.cc:
  Optimizing
sql/sql_class.cc:
  Optimizing
sql/sql_parse.cc:
  Added use of new 'localhost' variable
sql/violite.c:
  Fixed print bug

sql/mysqld.cc:
  Turn off RCS flag

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


sql/mysqld.cc:
  Auto merged

sql/mysqld.cc:
  Cleaned up structs/enums

into infomag.ape.relarn.ru:/usr/home/serg/src/mysql.safe/bk/mysql