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

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

Docs/manual.texi:
  Change note mods, 3.23.21 to 3.23.24.

Docs/manual.texi:
  Mods to data type sections.

manual.texi	@code{.ext} rather than @file{.ext} so they're
manual.texi	all consistent.


Docs/manual.texi:
  Fix filename extensions that were written using
  @code{.ext} rather than @file{.ext} so they're
  all consistent.

Docs/manual.texi:
  Change note mods, 3.23.10 to 3.23.20.

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


sql/sql_table.cc:
  Auto merged

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


Docs/manual.texi:
  Auto merged

manual.texi	small cleanups


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

configure.in:
  new configure parameter (now only for embeded server)
include/my_global.h:
  now query cache always included in server, because of problrms with test suit
mysql-test/r/flush.result:
  removed double testing
mysql-test/t/flush.test:
  removed double testing
mysql-test/t/grant_cache.test:
  now it is only memo about query cache
mysql-test/t/query_cache.test:
  now it is only memo about query cache

client/mysqlimport.c:
  Added --ignore-lines=# to mysqlimport

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  REPAIR ... USE_FRM documented
include/myisam.h:
  cleanup

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


Docs/manual.texi:
  Auto merged

SELECT_DEFAULT_LIMIT


Docs/manual.texi:
  Monty  forced me  to do this

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

Copyright ...-2002

sql/sql_yacc.yy:
  Auto merged

  Change the default innodb_data_file_path to create a 16M file and define it as auto-extending


sql/ha_innodb.cc:
  Change the default innodb_data_file_path to create a 16M file and define it as auto-extending

Docs/manual.texi:
  A few more full-text mods.

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

manual.texi	other miscellaneous cleanups.
manual.texi	fix missing word


Docs/manual.texi:
  revisions to FULLTEXT section.
  other miscellaneous cleanups.

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


Docs/manual.texi:
  Auto merged

manual.texi	"leafs" is not a word.  Except in hockey. :-)
manual.texi	fix typo


Docs/manual.texi:
  misc small cleanups

client/mysql.cc:
  Fixed a bug in mysql.cc in xml.

client/mysqldump.c:
  Fixed a bug in xml in mysqldump

manual.texi	typo


Docs/manual.texi:
  more Windows startup procedure cleanup

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


Docs/manual.texi:
  Auto merged

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

checkings


mysql-test/r/union.result:
  fix for the limit bug in UNION's
mysql-test/t/union.test:
  fix for the limit bug in UNION's
sql/sql_union.cc:
  fix for the limit bug in UNION's
sql/sql_yacc.yy:
  Syntax checking for options that should appear in main select only.