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

Docs/manual.texi:
  Changelog
client/mysql.cc:
  Added optional argument to --i-am-a-dummy
sql/handler.cc:
  Fix for innobase
sql/handler.h:
  Fix for innobase
sql/sql_class.cc:
  Fix for innobase
sql/sql_db.cc:
  Fixed that DROP DATABASE works on OS/2

Docs/manual.texi:
  merged

Change that handler gets file names in native format


Docs/manual.texi:
  Small bug fix
sql/Makefile.am:
  Added innobase handler files
sql/mysqld.cc:
  Added startup options for innobase
sql/sql_table.cc:
  Change that handler gets file names in native format

BitKeeper/etc/ignore:
  Added mysql-test/var/lib/mysql-bin.008 to the ignore list
mysql-test/r/3.23/sel000100.result:
  coredump fixed, now it makes sense to have something in the result file
mysql-test/t/3.23/sel000100.test:
  renamed result file

Docs/manual.texi:
  fixed typo
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changlog
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

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

BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test1.frm mysql-test/var/lib/test/test1.MYD mysql-test/var/lib/test/test1.MYI mysql-test/var/lib/test/test2.frm mysql-test/var/lib/test/test2.MYD mysql-test/var/lib/test/test2.MYI mysql-test/var/run/mysqld.pid mysql-test/var/tmp/mysql.sock to the ignore list

Docs/manual.texi:
  merged

Docs/manual.texi:
  "fine-tuning" section added to fulltext manual

Docs/manual.texi:
  Added a mirror in Italy and China.

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Fix for creating read-only files on windows
Manual updates


BitKeeper/deleted/.del-acconfig.h~65f1202b3b5c345f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-acconfig.h~7b620dbd69ea6074:
  ***MISSING WEAVE***
Docs/manual.texi:
  Small clarifications
BitKeeper/etc/ignore:
  Added Docs/manual.aux Docs/manual.cp Docs/manual.cps Docs/manual.dvi Docs/manual.fn Docs/manual.fns Docs/manual.ky Docs/manual.pg Docs/manual.toc Docs/manual.tp Docs/manual.vr Docs/manual_a4.ps Docs/manual_letter.ps to the ignore list
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysys/my_open.c:
  Fix for windows where some files where created read only
sql/ha_myisam.cc:
  Added 'checking table' to process-list status
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages

BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
sql/opt_range.cc:
  SCCS merged

BitKeeper/etc/ignore:
  added PENDING/*

BitKeeper/etc/ignore:
  Added libmysql_r/ctype_extra_sources.c libmysql_r/conf_to_src libmysql_r/.libs/libmysqlclient_r.lai to the ignore list

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
Docs/manual.texi:
  Clarifications
sql/opt_range.cc:
  Removed comment from critical code

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

    updates for temporary table replication, and docs for replicate-do/ignore-table
    updated change history
    fixed errors/warnings from makeinfo


Docs/manual.texi:
  updates for temporary table replication, and docs for replicate-do/ignore-table
  updated change history
  fixed errors/warnings from makeinfo
BitKeeper/etc/ignore:
  Added Docs/manual.log to the ignore list

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

fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile


BitKeeper/etc/ignore:
  Added client/thimble support-files/mysql-3.23.29-gamma.spec to the ignore list
client/mysqltest.c:
  added while, let, and echo, added fractional sec sleep support
client/thimble.cc:
  fixes to make it compile
mysql-test/t/3.23/rpl000001.test:
  sleep less
mysql-test/t/3.23/rpl000002.test:
  sleep less
mysql-test/t/3.23/rpl000003.test:
  sleep less
mysql-test/t/3.23/rpl000005.test:
  sleep less
sql/mysqld.cc:
  --abort-slave-event count
sql/slave.cc:
  remember temp tables when slave thread termintates and restore them on
  slave start
sql/slave.h:
  --abort-slave-event-count
sql/sql_parse.cc:
  remove warning

Docs/manual.texi:
  merged
  big deletion by yfaktoro@nslinuxw2.bedford.progress.com undone
  (I have to make a decision durion merge)
  He should re-delete, if it's what he really wanted to do.

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  SHOW KEYS updated, NEWS updated

sql/opt_range.cc:
  bugfix (sel000033.test)

Docs/manual.texi:
  Fix typos in books section.

Docs/manual.texi:
  Updated/Added books and their descriptions/links.

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Howards changes

Docs/manual.texi:
  News: added mysql-multi.server.sh

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