BitKeeper/etc/ignore:
  added tmp/*
Docs/manual.texi:
  SCCS merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BUILD/FINISH.sh:
  Moved symbolic files to tmp
Docs/manual.texi:
  Updated
mysql-test/r/func_str.result:
  Removed time functions
mysql-test/t/func_str.test:
  Removed time functions
mysql-test/t/order_by.test:
  Fixed sort problem
sql/sql_parse.cc:
  End transactions before LOCK TABLES

Docs/Support/test-make-manual:
  Cleaned up and added texi2dvi test.

into evoq.home.mwagner.org:/opt/local/x1/work/bk/mysql


BitKeeper/deleted/.del-sql-99.eps:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-manual.eps:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-pthreads.eps:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-algor.eps:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-in_21.eps:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-dubois.eps:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-ecomm.eps:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-dbi.eps:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-prof.eps:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-realmen.eps:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-msql.eps:
  Delete: Docs/Books/msql.eps
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into work.mysql.com:/d1/users/mwagner/work/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Removed book images until it's figured out.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

algor.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/algor.eps
dbi.eps 	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/dbi.eps
dubois.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/dubois.eps
ecomm.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/ecomm.eps
in_21.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/in_21.eps
manual.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/manual.eps
msql.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/msql.eps
prof.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/prof.eps
pthreads.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/pthreads.eps
realmen.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/realmen.eps


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

in_21.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/in_21.eps
ecomm.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/ecomm.eps
prof.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/prof.eps
realmen.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/realmen.eps
msql.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/msql.eps
manual.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/manual.eps
pthreads.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/pthreads.eps
algor.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/algor.eps
dubois.eps	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dubois.eps
dbi.eps 	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dbi.eps

Fixed result to new TZ setting


mysql-test/r/type_blob.result:
  Moved timestamp tests to type_timestamp
mysql-test/t/type_blob.test:
  Moved timestamp tests to type_timestamp
mysql-test/t/type_timestamp.test:
  Moved timestamp tests to type_timestamp

Added target test


Docs/Support/texinfo.tex:
  Fix for Tex 3.0
Makefile.am:
  Added target test
mysql-test/r/type_blob.result:
  Fix problem with ^M
mysql-test/t/type_blob.test:
  Fix problem with ^M

Build-tools/Do-rpm:
  Remove old packages before compiling

include/violite.h:
  Fixed typo
libmysql/violite.c:
  Removed not used parameter
man/Makefile.am:
  Added new manual pages
sql/net_serv.cc:
  Sync with libmysql/net.c

include/violite.h:
  Removed not used parameter
libmysql/libmysql.c:
  cleanup
sql/violite.c:
  Removed not used parameter

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updates for replication
sql/mysqld.cc:
  cleanup

myisam/mi_info.c:
  Fixed potential bug
scripts/safe_mysqld.sh:
  Only set --user if running as root
sql/ha_berkeley.cc:
  Fixed core dump bug in ALTER TABLE
sql/mysql_priv.h:
  Fixed wrong define
sql/mysqld.cc:
  Cleanup

msql.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/msql.txt
prof.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/prof.txt
algor.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/algor.txt
realmen.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/realmen.txt
dbi.txt 	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dbi.txt
ecomm.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/ecomm.txt
dubois.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dubois.txt
sql-99.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/sql-99.txt
pthreads.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/pthreads.txt
manual.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/manual.txt
in_21.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/in_21.txt
argentina.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/argentina.txt
argentina.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/argentina.gif
prof.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/prof.gif
realmen.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/realmen.gif
msql.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/msql.gif
manual.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/manual.gif
pthreads.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/pthreads.gif
ecomm.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/ecomm.gif
dbi.gif 	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dbi.gif
in_21.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/in_21.gif
dubois.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/dubois.gif
algor.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/algor.gif
sql-99.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Books/sql-99.gif


Docs/manual.texi:
  Added book images in books section.

fulltext_order_by.test	Rename: mysql-test/t/ft0000001.test -> mysql-test/t/fulltext_order_by.test
fulltext_multi.result	Rename: mysql-test/r/ft0000002.result -> mysql-test/r/fulltext_multi.result
fulltext_order_by.result	Rename: mysql-test/r/ft0000001.result -> mysql-test/r/fulltext_order_by.result


mysql-test/r/fulltext_order_by.result:
  Rename: mysql-test/r/ft0000001.result -> mysql-test/r/fulltext_order_by.result
mysql-test/r/fulltext_multi.result:
  Rename: mysql-test/r/ft0000002.result -> mysql-test/r/fulltext_multi.result
mysql-test/t/fulltext_order_by.test:
  Rename: mysql-test/t/ft0000001.test -> mysql-test/t/fulltext_order_by.test
mysql-test/t/fulltext_multi.test:
  Rename: mysql-test/t/ft0000002.test -> mysql-test/t/fulltext_multi.test

ft0000002.result	BitKeeper file /usr/home/serg/Abk/mysql/mysql-test/r/ft0000002.result

ft0000001.test	@result removed
mysql-test-run.sh	fixed
install_test_db.sh	Change mode to -rw-rw-r--
mysql-test-run.sh	Change mode to -rw-rw-r--


mysql-test/install_test_db.sh:
  Change mode to -rw-rw-r--
mysql-test/mysql-test-run.sh:
  fixed
mysql-test/t/ft0000001.test:
  @result removed
mysql-test/t/ft0000002.test:
  @result removed

sql/sql_show.cc:
  Auto merged

sql/sql_show.cc:
  merged

client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

BitKeeper/deleted/.del-select.res~1295456b93948768:
  ***MISSING WEAVE***

BUILD/compile-pentium-debug:
  Use /usr/local/BerkeleyDB-dbug/ if available
BUILD/compile-pentium:
  Use /usr/local/BerkeleyDB-opt/ if available
Docs/internals.texi:
  Added 'unedited' documentation for mysys functions
Docs/manual.texi:
  Cleanups
client/mysql.cc:
  Added client language to status
client/mysqltest.c:
  Fixed bug with --no-defaults
heap/_check.c:
  Added option to print status.
heap/hp_close.c:
  Update to use new status interface
heap/hp_hash.c:
  Clean up hash function and add new experimental hash
heap/hp_test1.c:
  Update to use new status interface
heap/hp_test2.c:
  Update to use new status interface
include/heap.h:
  Update to use new status interface
mysql-test/r/key_diff.result:
  Cleanup tests that may give rows in random order
mysql-test/r/type_blob.result:
  Removed \r from output as this confused bk
mysql-test/t/key_diff.test:
  Cleanup tests that may give rows in random order
BitKeeper/etc/ignore:
  Added Docs/my_sys.doc to the ignore list
mysql-test/t/type_blob.test:
  Removed \r from output as this confused bk
mysys/hash.c:
  Add new experimental hash function
scripts/safe_mysqld.sh:
  Added --mysqld option
sql/ha_innobase.cc:
  Fixed store_locking
sql/mysqld.cc:
  Cleaned up warning messages

client/mysqltest.c:
  Clean-ups.

mysql-test-run.sh	Couple more clean-ups.


mysql-test/mysql-test-run.sh:
  Couple more clean-ups.
client/mysqltest.c:
  Added --no-defaults to usage().

support-files/mysql.server.sh:
  Use -f instead of -e to test for lock file.

into cane.mysql.fi:/usr/home/tim/my/work

ha_berkeley.
A few smaller bug fixes.


sql/ha_berkeley.cc:
  - Don't use subtransactions on write_row() and delete_row()
  - Bug fixes for sharing DB *file
sql/ha_berkeley.h:
  - Don't use subtransactions on write_row() and delete_row()
  - Bug fixes for sharing DB *file
sql/ha_myisam.cc:
  - fix compiler warning
sql/log_event.cc:
  - fix compiler warning

BitKeeper/deleted/.del-select.res~1295456b93948768:
  ***MISSING WEAVE***

Fixed bug with ALTER TABLE on HEAP tables


mysql-test/r/alter_table.result:
  Turn off SCCS flag
mysql-test/r/analyse.result:
  Turn off SCCS flag
mysql-test/r/auto_increment.result:
  Turn off SCCS flag
mysql-test/r/bdb.result:
  Turn off SCCS flag
mysql-test/r/bigint.result:
  Turn off SCCS flag
mysql-test/r/binary.result:
  Turn off SCCS flag
mysql-test/r/case.result:
  Turn off SCCS flag
mysql-test/r/comments.result:
  Turn off SCCS flag
mysql-test/r/compare.result:
  Turn off SCCS flag
mysql-test/r/count_distinct.result:
  Turn off SCCS flag
mysql-test/r/create.result:
  Turn off SCCS flag
mysql-test/r/delayed.result:
  Turn off SCCS flag
mysql-test/r/distinct.result:
  Turn off SCCS flag
mysql-test/r/empty_table.result:
  Turn off SCCS flag
mysql-test/r/explain.result:
  Turn off SCCS flag
mysql-test/r/ft0000001.a.result:
  Turn off SCCS flag
mysql-test/r/ft0000001.b.result:
  Turn off SCCS flag
mysql-test/r/ft0000001.c.result:
  Turn off SCCS flag
mysql-test/r/ft0000001.d.result:
  Turn off SCCS flag
mysql-test/r/ft0000001.e.result:
  Turn off SCCS flag
mysql-test/r/ft0000002.a.result:
  Turn off SCCS flag
mysql-test/r/ft0000002.b.result:
  Turn off SCCS flag
mysql-test/r/ft0000002.c.result:
  Turn off SCCS flag
mysql-test/r/fulltext.result:
  Turn off SCCS flag
mysql-test/r/func_crypt.result:
  Turn off SCCS flag
mysql-test/r/func_date_add.result:
  Turn off SCCS flag
mysql-test/r/func_equal.result:
  Turn off SCCS flag
mysql-test/r/func_group.result:
  Turn off SCCS flag
mysql-test/r/func_in.result:
  Turn off SCCS flag
mysql-test/r/func_like.result:
  Turn off SCCS flag
mysql-test/r/func_math.result:
  Turn off SCCS flag
mysql-test/r/func_misc.result:
  Turn off SCCS flag
mysql-test/r/func_op.result:
  Turn off SCCS flag
mysql-test/r/func_regexp.result:
  Turn off SCCS flag
mysql-test/r/func_set.result:
  Turn off SCCS flag
mysql-test/r/func_str.result:
  Turn off SCCS flag
mysql-test/r/func_system.result:
  Turn off SCCS flag
mysql-test/r/func_test.result:
  Turn off SCCS flag
mysql-test/r/func_time.result:
  Turn off SCCS flag
mysql-test/r/group_by.result:
  Turn off SCCS flag
mysql-test/r/heap.result:
  Turn off SCCS flag
mysql-test/r/ins000001.result:
  Turn off SCCS flag
mysql-test/r/insert.result:
  Turn off SCCS flag
mysql-test/r/insert_select.result:
  Turn off SCCS flag
mysql-test/r/join.result:
  Turn off SCCS flag
mysql-test/r/join_outer.result:
  Turn off SCCS flag
mysql-test/r/key.result:
  Turn off SCCS flag
mysql-test/r/key_diff.result:
  Turn off SCCS flag
mysql-test/r/key_primary.result:
  Turn off SCCS flag
mysql-test/r/keywords.result:
  Turn off SCCS flag
mysql-test/r/limit.result:
  Turn off SCCS flag
mysql-test/r/merge.result:
  Turn off SCCS flag
mysql-test/r/null.result:
  Turn off SCCS flag
mysql-test/r/null_key.result:
  Turn off SCCS flag
mysql-test/r/odbc.result:
  Turn off SCCS flag
mysql-test/r/order_by.result:
  Turn off SCCS flag
mysql-test/r/raid.result:
  Turn off SCCS flag
mysql-test/r/range.result:
  Turn off SCCS flag
mysql-test/r/rename.result:
  Turn off SCCS flag
mysql-test/r/replace.result:
  Turn off SCCS flag
mysql-test/r/rollback.result:
  Turn off SCCS flag
mysql-test/r/rpl000001.a.result:
  Turn off SCCS flag
mysql-test/r/rpl000001.b.result:
  Turn off SCCS flag
mysql-test/r/rpl000002.result:
  Turn off SCCS flag
mysql-test/r/rpl000003.result:
  Turn off SCCS flag
mysql-test/r/rpl000004.a.result:
  Turn off SCCS flag
mysql-test/r/rpl000004.b.result:
  Turn off SCCS flag
mysql-test/r/rpl000005.result:
  Turn off SCCS flag
mysql-test/r/rpl000006.result:
  Turn off SCCS flag
mysql-test/r/rpl000007.result:
  Turn off SCCS flag
mysql-test/r/rpl000008.result:
  Turn off SCCS flag
mysql-test/r/rpl000009.result:
  Turn off SCCS flag
mysql-test/r/rpl000010.result:
  Turn off SCCS flag
mysql-test/r/rpl000011.result:
  Turn off SCCS flag
mysql-test/r/rpl000012.result:
  Turn off SCCS flag
mysql-test/r/rpl000012.status.result:
  Turn off SCCS flag
mysql-test/r/rpl000013.result:
  Turn off SCCS flag
mysql-test/r/rpl000013.status.result:
  Turn off SCCS flag
mysql-test/r/rpl000014.result:
  Turn off SCCS flag
mysql-test/r/rpl000015.result:
  Turn off SCCS flag
mysql-test/r/rpl000016.result:
  Turn off SCCS flag
mysql-test/r/sel000001.result:
  Turn off SCCS flag
mysql-test/r/sel000002.result:
  Turn off SCCS flag
mysql-test/r/sel000003.result:
  Turn off SCCS flag
mysql-test/r/sel000031.result:
  Turn off SCCS flag
mysql-test/r/sel000032.result:
  Turn off SCCS flag
mysql-test/r/sel000033.result:
  Turn off SCCS flag
mysql-test/r/sel000100.result:
  Turn off SCCS flag
mysql-test/r/select_safe.result:
  Turn off SCCS flag
mysql-test/r/show_check.result:
  Turn off SCCS flag
mysql-test/r/shw000001.result:
  Turn off SCCS flag
mysql-test/r/slave-running.result:
  Turn off SCCS flag
mysql-test/r/slave-stopped.result:
  Turn off SCCS flag
mysql-test/r/tablelock.result:
  Turn off SCCS flag
mysql-test/r/temp_table.result:
  Turn off SCCS flag
mysql-test/r/truncate.result:
  Turn off SCCS flag
mysql-test/r/type_blob.result:
  Turn off SCCS flag
mysql-test/r/type_date.result:
  Turn off SCCS flag
mysql-test/r/type_datetime.result:
  Turn off SCCS flag
mysql-test/r/type_enum.result:
  Turn off SCCS flag
mysql-test/r/type_float.result:
  Turn off SCCS flag
mysql-test/r/type_ranges.result:
  Turn off SCCS flag
mysql-test/r/type_time.result:
  Turn off SCCS flag
mysql-test/r/type_timestamp.result:
  Turn off SCCS flag
mysql-test/r/type_uint.result:
  Turn off SCCS flag
mysql-test/r/type_year.result:
  Turn off SCCS flag
mysql-test/r/update.result:
  Turn off SCCS flag
mysql-test/r/varbinary.result:
  Turn off SCCS flag
mysql-test/r/variables.result:
  Turn off SCCS flag
Docs/manual.texi:
  Changelog
client/my_readline.h:
  Added read length to readline()
client/mysql.cc:
  cleanup
client/mysqladmin.c:
  cleanup
client/mysqldump.c:
  Added handling of hexadecimal constants
client/mysqlimport.c:
  Version change
client/mysqltest.c:
  Don't append the .reject extension, instead replace the old extension
client/readline.cc:
  Added read length to readline()
heap/hp_open.c:
  extra debug
merge/rrnd.c:
  Fix bug in merge tables
mysql-test/install_test_db.sh:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Portability fixes
  Added --ddd and --debug options
scripts/mysqld_multi.sh:
  Add pathname to mysqladmin
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql/mysqld.cc:
  Some fixes for gemini
sql/sql_table.cc:
  Fixed bug with ALTER TABLE on HEAP tables

into evoq.home.mwagner.org:/opt/local/x1/work/bk/mysql

mysql-test/mysql-test-run.sh:
  Added spit-polish. Also --verbose is default now.

Docs/manual.texi:
  Mirror added in China.