mysys/charset.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged

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

Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_table.cc:
  Auto merged

Docs/manual.texi:
  Update for Access 2000
extra/perror.c:
  Added --silent
include/my_pthread.h:
  Patch for windows
scripts/safe_mysqld.sh:
  Fix of bug in --patch
sql/sql_lex.cc:
  Allow numbers of type 1e1
sql/sql_string.h:
  Safety fix
sql/sql_table.cc:
  Portability fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changes for 3.23 and change Ansi mode -> ANSI mode
include/my_base.h:
  Automatic repair of MyISAM tables
include/myisam.h:
  Automatic repair of MyISAM tables
myisam/ft_update.c:
  Portability fix
myisam/mi_check.c:
  Automatic repair of MyISAM tables
myisam/mi_open.c:
  Automatic repair of MyISAM tables
myisam/myisamchk.c:
  Allow one to combine check with --old-repair
myisam/sort.c:
  Fix for usage of IO_CACHE
mysys/charset.c:
  Portability fixes
mysys/default.c:
  Added --defaults-extra-dir
mysys/mf_tempfile.c:
  Portability fixes
mysys/my_init.c:
  Remove compiler warning
mysys/my_pread.c:
  Remove compiler warning
sql-bench/server-cfg.sh:
  New benchmark tests
sql-bench/test-insert.sh:
  New benchmark tests
sql/ha_myisam.cc:
  Automatic repair of MyISAM tables
sql/ha_myisam.h:
  Automatic repair of MyISAM tables
sql/handler.h:
  Automatic repair of MyISAM tables
sql/lock.cc:
  Add missing free
sql/log_event.cc:
  Portability fixes
sql/sql_base.cc:
  Automatic repair of MyISAM tables
sql/sql_select.h:
  Remove compiler warning
sql/sql_table.cc:
  Clean up intendent
sql/sql_yacc.yy:
  New syntax for CHECK
sql/table.cc:
  Automatic repair of MyISAM tables
sql/table.h:
  Automatic repair of MyISAM tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  fixed typo

sel000002.result	BitKeeper file /d1/users/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000002.result
.del-select-key.test	Delete: mysql-test/t/3.23/select-key.test
.del-simple-select.test	Delete: mysql-test/t/3.23/simple-select.test
sel000001.test	BitKeeper file /d1/users/mwagner/work/bk/mysql/mysql-test/t/3.23/sel000001.test
sel000002.test	BitKeeper file /d1/users/mwagner/work/bk/mysql/mysql-test/t/3.23/sel000002.test


BitKeeper/deleted/.del-select-key.test:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-simple-select.test:
  ***MISSING WEAVE***

run-all-tests	mysql-test -> mysqltest
README  	mysql-test -> mysqltest
Makefile.am	Retargetted mysql-test to mysqltest.
.del-mysql-test.c	Delete: client/mysql-test.c
mysql-test-run	Added program definitions.
mysqltest.c	BitKeeper file /home/mwagner/work/bk/mysql/client/mysqltest.c


mysql-test/mysql-test-run:
  Added program definitions.
BitKeeper/deleted/.del-mysql-test.c:
  ***MISSING WEAVE***
client/Makefile.am:
  Retargetted mysql-test to mysqltest.
repl-tests/README:
  mysql-test -> mysqltest
repl-tests/run-all-tests:
  mysql-test -> mysqltest
repl-tests/test-repl-ts/run.test:
  mysql-test -> mysqltest

mysql-test/README:
  ***MISSING WEAVE***

mysql-test-run now works, althought the output needs beautification
add two *real* test cases that everyone can run - yahoo! we are moving!


mysql-test/t/3.23/select-key.test:
  ***MISSING WEAVE***
mysql-test/t/3.23/simple-select.test:
  ***MISSING WEAVE***
mysql-test/std_data/select-key.master:
  ***MISSING WEAVE***
mysql-test/std_data/simple-select.master:
  ***MISSING WEAVE***
client/mysql-test.c:
  ***MISSING WEAVE***
mysql-test/mysql-test-run:
  "fixed" subsitution error - one still needs to do something real to make it pretty

undid hack to work around missin opt_ft.*


mysql-test/mybin/mysql-test_install_db:
  got it to the point where mysqld starts on my system
mysql-test/mysql-test-run:
  fixed some syntax errors
sql/sql_select.cc:
  undid my hack to make it compile, since opt_ft.* is now in bk

into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql

README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/share/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/std_data/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/t/3.22/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/t/3.23/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/var/lib/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/var/log/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/var/run/README
README  	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/var/tmp/README


mysql-test/r/3.22/README:
  ***MISSING WEAVE***
mysql-test/share/README:
  ***MISSING WEAVE***
mysql-test/std_data/README:
  ***MISSING WEAVE***
mysql-test/t/3.22/README:
  ***MISSING WEAVE***
mysql-test/var/lib/README:
  ***MISSING WEAVE***
mysql-test/var/log/README:
  ***MISSING WEAVE***
mysql-test/var/run/README:
  ***MISSING WEAVE***
mysql-test/var/tmp/README:
  ***MISSING WEAVE***

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

include/my_sys.h:
  make get_charsets_dir a public function
libmysql/libmysql.c:
  show charsets dir instead of the string "default" in error message
mysys/charset.c:
  make get_charsets_dir a public function

sql_select.cc	sasha's workaround removed


sql/sql_select.cc:
  Coredump in FULLTEXT code fixed

Docs/manual.texi:
  moved @cindex uptime to the right place, so that texi2html does
  actually generate an achor for it

Docs/manual.texi:
  Reworked propaganda in Contact information section.

Docs/manual.texi:
  Reactivated some mirrors.

sql/opt_ft.cc:
  Change mode to -rw-rw-r--
sql/opt_ft.h:
  Change mode to -rw-rw-r--

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


Docs/manual.texi:
  Auto merged

    replication updates
sql/opt_range.h
    fixed compiler warning
sql/slave.cc
    fixed handling of long usernames
    fixed insert_id + query log event processing atomicity in the case
    of slave death
    fix edcharset coversion to not be global to all threads
sql/sql_class.h
    fix to make insert_id event and the subsequent query event be still processed
    atomically if slave dies in the middle
sql/sql_select.cc
    temp fix to make it compile 
repl-tests/test-auto-inc/run.test@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/run.test''
repl-tests/test-auto-inc/x.master@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/x.master''



Docs/manual.texi:
  replication updates
sql/opt_range.h:
  fixed compiler warning
sql/slave.cc:
  fixed handling of long usernames
  fixed insert_id + query log event processing atomicity in the case
  of slave death
  fix edcharset coversion to not be global to all threads
sql/sql_class.h:
  fix to make insert_id event and the subsequent query event be still processed
  atomically if slave dies in the middle
sql/sql_select.cc:
  temp fix to make it compile

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changed evenheading on NuSphere manual.

configure.in:
  merged
BitKeeper/etc/logging_ok:
  Auto merged
sql/filesort.cc:
  merged
sql/sql_select.cc:
  merged

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


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

    set character set is not being logged


sql/log.cc:
  set character set is not being logged

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

Fixes when using column privileges
Manual updates


Docs/manual.texi:
  Comments from MySQL training + distinct optimization
extra/my_print_defaults.c:
  Added --defaults-extra-file
include/my_sys.h:
  Added --defaults-extra-file
mysys/default.c:
  Added --defaults-extra-file
sql/sql_acl.cc:
  Tables with only column privileges didn't show up in SHOW GRANTS or SHOW TABLES
sql/sql_select.cc:
  DISTINCT optimization
sql/sql_select.h:
  DISTINCT optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    Added magic number to binlog
sql/log_event.cc
    distinquish bogus data from truncated logs
sql/log_event.h
    added magic number
    added LOG_READ_TRUNC error
sql/mysqlbinlog.cc
    fixed to handle magic number
    added O_BINARY to my_fopen
sql/mysqld.cc
    added code for replicate-rewrite-db
sql/slave.cc
    replicate-rewrite-db
    O_BINARY
    handle magic
sql/sql_class.h
    added i_string_pair class
sql/sql_repl.cc
    added magic
    better error messages
support-files/magic
    added magic for binlog

Added test case for replication of queries with error


sql/log.cc:
  Added magic number to binlog
sql/log_event.cc:
  distinquish bogus data from truncated logs
sql/log_event.h:
  added magic number
  added LOG_READ_TRUNC error
sql/mysqlbinlog.cc:
  fixed to handle magic number
  added O_BINARY to my_fopen
sql/mysqld.cc:
  added code for replicate-rewrite-db
sql/slave.cc:
  replicate-rewrite-db
  O_BINARY
  handle magic
sql/sql_class.h:
  added i_string_pair class
sql/sql_repl.cc:
  added magic
  better error messages
support-files/magic:
  added magic for binlog

Docs/manual.texi:
  Removed bugs from manual; Updated CHECK TABLE

Docs/manual.texi:
  Auto merged

configure.in:
  Fix for mkstemp
libmysql/Makefile.shared:
  Fix for mkstemp
myisam/mi_open.c:
  Added more debug info
mysys/mf_tempfile.c:
  Fixed type
sql/sql_repl.cc:
  Added missing header file