Docs/manual.texi:
  Added link to MySQL Free Public License in policy section.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Fixed the TRUNCATE syntax + Changelog
include/my_sys.h:
  Added my_b_vprintf
mysys/mf_iocache2.c:
  Added my_b_vprintf
mysys/my_vsnprintf.c:
  Fixed fatal (new) bug
mysys/thr_lock.c:
  Cleanup
readline/bind.c:
  cleanup
scripts/Makefile.am:
  Added mysqldumpslow
sql-bench/crash-me.sh:
  Fixed TRUNCATE
sql/log.cc:
  bug fix
sql/log_event.cc:
  Removed compiler warnings
sql/log_event.h:
  Fixed non portable header in binary dump
sql/mf_iocache.cc:
  cleanup
sql/mysqld.cc:
  Fixed loop problem on NT
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  Fixed typos
sql/sql_parse.cc:
  cleanup
sql/sql_select.cc:
  bugfix
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Changed ALTER TABLE ... ORDER BY to get fewer warnings
sql/unireg.cc:
  cleanup
sql/unireg.h:
  Added missing define

mysys/my_open.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added information about 4.0
mysys/my_open.c:
  Fix for usage with IO_CACHE
sql/log.cc:
  Cleanup for IO_CACHE
sql/mysqld.cc:
  cleanup
sql/sql_class.cc:
  Fixed wrong defines
sql/sql_class.h:
  Fixed usage of SET TIMESTAMP=#

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


BitKeeper/etc/logging_ok:
  auto-union

    make -j 2
mysys/my_open.c
    my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc
    fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc
    fixed up IO_CACHE


BUILD/compile-pentium-debug:
  make -j 2
BitKeeper/etc/ignore:
  Added repl-tests/test-repl/sum-wlen-slave.master.reje support-files/mysql-3.23.28-gamma.spec to the ignore list
mysys/my_open.c:
  my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc:
  fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc:
  fixed up IO_CACHE

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

sql/item_func.cc:
  bugfix - two fulltext indices were not working sometimes

sql/log_event.h:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto converge

Docs/manual.texi:
  Type fixes
myisam/mi_create.c:
  Fixed bug in update from different processes
myisam/mi_locking.c:
  Fixed bug in update from different processes
myisam/mi_open.c:
  Fixed bug in update from different processes
myisam/mi_search.c:
  Fixed bug in update from different processes
myisam/myisamdef.h:
  Fixed bug in update from different processes
mysys/Makefile.am:
  Added mf_iocache2.c
sql/log.cc:
  Changed to use IO_CACHE instead of FILE
sql/sql_class.h:
  Changed to use IO_CACHE instead of FILE
sql/sql_repl.cc:
  Changed to use IO_CACHE instead of FILE
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

     fixed bug - mutex was not being released if master.info could not be read



sql/slave.cc:
   fixed bug - mutex was not being released if master.info could not be read

configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged

BitKeeper/deleted/.del-mf_reccache.c:
  ***MISSING WEAVE***
Docs/manual.texi:
  Fix licence information + update changelog
client/mysqlimport.c:
  Fixed typo
client/sql_string.cc:
  Added support for IO_CACHE
client/sql_string.h:
  Added support for IO_CACHE
include/my_sys.h:
  More options for IO_CACHE
mysql.proj:
  Update
mysys/Makefile.am:
  Remoced mf_reccache.c
mysys/mf_cache.c:
  Fixed return value on error and optimzed used of write cache files
mysys/mf_iocache.c:
  More options for IO_CACHE
mysys/my_vsnprintf.c:
  Optimized code
sql/mf_iocache.cc:
  merge with mf_iocache.c
sql/net_pkg.cc:
  cleanup
sql/sql_class.cc:
  Support for transaction safe log files
sql/sql_string.cc:
  Added support for IO_CACHE
sql/sql_string.h:
  Added support for IO_CACHE
sql/time.cc:
  cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Fourth batch of Howard's changes

Docs/manual.texi:
  Third batch of Howard's changes for NuSphere

    this file needs to be deleted
sql/log_event.cc
    fixed warnings
sql/log_event.h
    fixed () #define bug
sql/mysqlbinlog.cc
    fixed length argument - was supposed to be one less
sql/mysqld.cc
    replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
    updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
    changes fore replicate-do/ignore-table
    close the socket before going to sleep sleeping after error
    bad event was being freed too early
sql/slave.h
    changes for replicate-do/ignore-table
sql/sql_class.cc
    slave_thread variable to THD
sql/sql_class.h
    added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
    updating argument to add_tables_to_list()
sql/sql_table.cc
    fixed bug in mysql_rm_table()
sql/sql_yacc.yy
    fixed up add_table_to_list() calls to accept updating argument
sql/table.h
    added updating to TABLE_LIST


repl-tests/test-repl-ts/repl-timestamp.master.reject:
  this file needs to be deleted
sql/log_event.cc:
  fixed warnings
sql/log_event.h:
  fixed () #define bug
sql/mysql_priv.h:
  updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/mysqlbinlog.cc:
  fixed length argument - was supposed to be one less
sql/mysqld.cc:
  replicate-do/ignore-table now works, wild does not yet
sql/slave.cc:
  changes fore replicate-do/ignore-table
  close the socket before going to sleep sleeping after error
  bad event was being freed too early
sql/slave.h:
  changes for replicate-do/ignore-table
sql/sql_class.cc:
  slave_thread variable to THD
sql/sql_class.h:
  added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc:
  updating argument to add_tables_to_list()
sql/sql_table.cc:
  fixed bug in mysql_rm_table()
sql/sql_yacc.yy:
  fixed up add_table_to_list() calls to accept updating argument
sql/table.h:
  added updating to TABLE_LIST

Docs/manual.texi:
  Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
  Added --timeout
client/mysqladmin.c:
  Safer password handling
client/mysqldump.c:
  Safer password handling
client/mysqlimport.c:
  Safer password handling
client/mysqlshow.c:
  Safer password handling
configure.in:
  Fixes for Darwin and added test of poll
include/my_pthread.h:
  Fixes for darwin
include/violite.h:
  Added test for polling
libmysql/libmysql.c:
  connect timeout
libmysql/violite.c:
  connect timeout
mysys/hash.c:
  Fix when delting from empty table
scripts/safe_mysqld.sh:
  Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
  Function print_time
sql-bench/crash-me.sh:
  Added test of truncate
sql-bench/test-insert.sh:
  More "estimated" tests
sql-bench/test-select.sh:
  More "estimated" tests
sql/filesort.cc:
  Removed allocation of extra memory
sql/ha_berkeley.cc:
  Better estimation of number of rows
sql/item_create.cc:
  Truncate
sql/item_create.h:
  Truncate
sql/item_strfunc.cc:
  Removed usage of MY_FAE
sql/lex.h:
  Truncate
sql/lock.cc:
  Fixed possible loop bug
sql/log.cc:
  Removed usage of FILE:s
sql/mysqld.cc:
  Print of more server variables
sql/sql_class.h:
  Changed FILE -> File
sql/sql_insert.cc:
  Fixed bug in temptable handling
sql/sql_lex.h:
  Cleanup
sql/sql_load.cc:
  Removed usage of MY_FAE
sql/sql_parse.cc:
  Cleanup + TRUNCATE
sql/sql_select.cc:
  Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
  TRUNCATE
sql/violite.c:
  Merge with client/violite.c
strings/strstr-sparc.s:
  Fixed wrong register usage

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Second batch of Howard's changes

Docs/manual.texi:
  Mirror addition.
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
sql/mysql_priv.h:
  Auto merged

Docs/manual.texi:
  Oops, typo.

into laptop.slkc.uswest.net:/home/sasha/src/mysql


BitKeeper/etc/logging_ok:
  auto-union

sql/log_event.cc:
  added sanity check to catch partial event reads from the master

BUILD/compile-pentium-debug-no-bdb:
  forgot to install BDB on my laptop, needed to have this
sql/log.cc:
  fixed initialization warning
sql/sql_insert.cc:
  delayed insert was getting logged on failure. To make things worse,
  all delayed inserts were being logged with query_length=0
sql/sql_repl.cc:
  fixed compiler warnings

BUILD/compile-pentium-debug:
  added -DEXTRA_DEBUG
sql/Makefile.am:
  added slave.h
sql/log_event.h:
  max_buf -> event_len in read_log_event
sql/mysql_priv.h:
  moved the slave part to slave.h
sql/mysqld.cc:
  changes for replcate_do/ignore_table ( does not work yet)
sql/slave.cc:
  removed the stuff covered by slave.h
sql/sql_class.h:
  moved slave stuff to slave.h
sql/sql_repl.h:
  removed stuff covered by slave.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/ChangeLog:
  Whoops, forgot to update the ChangeLog.

Docs/manual.texi:
  Added documentation for ALTER TABLE ... ORDER BY ...
sql/mysql_priv.h:
  Exported make_unireg_sortorder
  Exported setup_order
sql/sql_base.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_parse.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_select.cc:
  Moved make_unireg_sortorder and setup_order prototypes to
  mysql_priv.h and made them non-static so that they can be 
  used elsewhere.  Needed for ALTER TABLE ... ORDER BY ...

Docs/manual.texi:
  First batch of changes from howard katz
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  Auto merged

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

myisam/ft_parser.c:
  minor bug that causes slightly incorrect weights and was found only by occation fixed

Docs/manual.texi:
  Added index for LOAD_FILE()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  clarified language about logo requirement.

with BEGIN WORK.

into threads.polyesthetic.msg:/usr/local/src/my/work

ha_berkeley.cc	bug fixes to make OPT_BEGIN work properly
handler.cc	bug fixes to make OPT_BEGIN work properly


sql/handler.cc:
  bug fixes to make OPT_BEGIN work properly
sql/ha_berkeley.cc:
  bug fixes to make OPT_BEGIN work properly
sql/sql_parse.cc:
  test for changing to auto_commit mode was backwards

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