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.

root owns all except data dir (mysql), all in mysql group.

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

Docs/manual.texi:
  clarify some of the Windows startup procedure

into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0

Cleaned up internals.texi, changed tabs to spaces.


Docs/Makefile.am:
  Added Makefile.am targets for internals.texi.
Docs/internals.texi:
  Cleanups, replaced tabs with spaces.

manual.texi	clarify sentence.


Docs/manual.texi:
  Misc. minor cleanups.

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

Docs/Support/colspec-fix.pl:
  Added code snippet to handle colspec numbering
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into sanja.is.com.ua:/home/bell/mysql/work.etalon


sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged