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 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

into george.bitbike.com:/home/arjen/mysql-4.0

  Some more column width fraction fixups.
  Filled out a table with proper number of columns.
  Some typo/style fixes.
  Zapped inaccurate uninformative roadmap table.


Docs/manual.texi:
  Some more column width fraction fixups.
  Filled out a table with proper number of columns.
  Some typo/style fixes.
  Zapped inaccurate uninformative roadmap table.

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

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

  Little fixups.


Docs/manual.texi:
  Little fixups.

  Auch typo fix (tnx Paul!)


Docs/manual.texi:
  Auch typo fix (tnx Paul!)

  Fixed caps.


Docs/manual.texi:
  Fixed caps.

  Licensing and various other fixups (Zak & Arjen).


Docs/manual.texi:
  Licensing and various other fixups (Zak & Arjen).

  Translated new error message to Dutch.


sql/share/dutch/errmsg.txt:
  Translated new error message to Dutch.

  Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.


Docs/manual.texi:
  Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.

  multitable column fractions fixed ch.1-3 (for O'Reilly).


Docs/manual.texi:
  multitable column fractions fixed ch.1-3 (for O'Reilly).

  @Node name change Parenthesis -> Parentheses (from Paul DuBois)


Docs/manual.de.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)
Docs/manual.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)

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

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


Docs/manual.texi:
  Auto merged

manual.texi	modify a few @xref{}s.
manual.texi	missing @code{}.


Docs/manual.texi:
  Change note mods, 3.22.27 and below.

  Text cleanup (by Colin Faber).


Docs/manual.texi:
  Text cleanup (by Colin Faber).

  Logging to logging@openlogging.org accepted
manual.texi:
  'migration' not a keyword.


Docs/manual.texi:
  'migration' not a keyword.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

fixed compilation problem on FreeBSD
added test for truncating temporary tables


mysql-test/r/truncate.result:
  truncate test
mysql-test/t/truncate.test:
  truncate test update
mysys/safemalloc.c:
  fixed FreeBSD compilation problem
sql/sql_delete.cc:
  fixed bug in truncating temporary tables

Docs/manual.texi:
  SCO updates
client/mysql.cc:
  Don't die on SIGQUIT