Docs/manual.texi:
  SCCS merged

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

client/mysql.cc:
  Added a lost option in my_getopt conversion.
myisam/myisamchk.c:
  Fixed a couple of wrong -type bugs.

manual.texi	Minor mods to OPTIMIZE TABLE section.


Docs/manual.texi:
  Use @strong{lowercasename} consistently to refer to privileges.

Docs/manual.texi:
  Table types are @code{}, not @strong{}.

manual.texi	Fix a bunch of menu/section titles that are
manual.texi	missing @code{} around command names.
manual.texi	Use question marks at the end of questions.
manual.texi	Added missing 3.23.16 change note about
manual.texi	SLAVE START/STOP.


Docs/manual.texi:
  Use I/O consistently, not I/O sometimes and i/o sometimes.

manual.texi	FLUSH MASTER/SLAVE to RESET MASTER/SLAVE.


Docs/manual.texi:
  - Added missing change not about renming of
    FLUSH MASTER/SLAVE to RESET MASTER/SLAVE.

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Build-tools/Do-patch-file:
  Fixed paths

Docs/manual.texi:
  Auto merged

Removed some files from the bitkeeper delete tree.
(To fix problem with duplicate filenames on MacOS X)


BitKeeper/deleted/.del-ha_hash.h~27e36916116beb3e:
  Delete: sql/ha_hash.h
Docs/manual.texi:
  Fixed typo

SQL keywords/statements in caps.

into teton.kitebird.com:/home/paul/mysql-4.0

into mysql.sashanet.com:/reiser-data/mysql-4.0

Docs/manual.texi:
  Change note mods, 4.0.2.

Docs/manual.texi:
  fix typo, clarify sentence

client/mysql.cc:
  Fixed bug in option -A.
client/mysqldump.c:
  Removed unused variable.

myisam/myisamchk.c:
  Fixed some spelling errors.

into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/mysqld.cc:
  Auto merged

bison 1.34 yacc rule compliance
more robust handling of relay log corruption


mysql-test/r/rpl000014.result:
  updated result
mysql-test/r/rpl_log.result:
  updated result
sql/mysqld.cc:
  reckless slave option
sql/slave.cc:
  reckless slave + more robust handling of relay log corruption
sql/slave.h:
  reckless slave
sql/sql_yacc.yy:
  brought the rules into compliance with bison 1.34 by adding ';' at the end of each rule

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/sql_select.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  A few @itemize lists should be @table @code lists

manual.texi	- redo the parts that weren't so dumb


Docs/manual.texi:
  - undo my previous unbelievably dumb patch
  - redo the parts that weren't so dumb

sql/mysqld.cc:
  fake query_cache_size parameter if query cache code excluded from server

percentages instead of portions of a 72 character wide line. Patch is 
trivial and hacky, but no point in redoing it later... :)

Docs/Support/colspec-fix.pl:
  Various improvements, error checks and cleaning
   - Increased gutter size
   - Added check to ensure that total column % is not greater than 100%
   - Changed code to work with hacks to makeinfo
   - Ensure that total column width is less than max table width
   - Trim overly long end columns if needed

include/my_sys.h:
  memory root structures definition put in one file
include/mysql.h:
  memory root structures definition put in one file

Docs/manual.texi:
  Auto merged

client/mysql.cc:
  Auto merged

Split handler->option_flag() to handler->table_flags() and handler->index_flags()


Docs/manual.texi:
  Updated standard binary options
include/my_base.h:
  Update for BTREE keys in HEAP tables
libmysql/net.c:
  merge with net_serv.cc
mysql-test/r/func_misc.result:
  Update for new behaviour of inet_ntoa
sql/field.cc:
  Update for BTREE keys in HEAP tables
sql/field.h:
  Update for BTREE keys in HEAP tables
sql/filesort.cc:
  Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
  Update for BTREE keys in HEAP tables
sql/ha_heap.h:
  Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
  Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_isam.h:
  Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
  Update for BTREE keys in HEAP tables
sql/handler.cc:
  Update for BTREE keys in HEAP tables
sql/handler.h:
  Update for BTREE keys in HEAP tables
sql/log.cc:
  Update for BTREE keys in HEAP tables
sql/net_serv.cc:
  Update for BTREE keys in HEAP tables
sql/opt_range.cc:
  Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
  Update for BTREE keys in HEAP tables
sql/records.cc:
  Update for BTREE keys in HEAP tables
sql/sql_class.h:
  Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
  Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
  Update for BTREE keys in HEAP tables
sql/sql_select.cc:
  Update for BTREE keys in HEAP tables
sql/sql_show.cc:
  Update for BTREE keys in HEAP tables
sql/sql_table.cc:
  Update for BTREE keys in HEAP tables
sql/structs.h:
  Update for BTREE keys in HEAP tables
sql/table.cc:
  Update for BTREE keys in HEAP tables
sql/unireg.cc:
  Update for BTREE keys in HEAP tables