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


Docs/manual.texi:
  Auto merged

Add URL reference to "Enforcing the GPL" article.
Removed duplicate SQL_BUFFER_RESULT/SQL_SMALL_RESULT texts (reported by Fournier Jocelyn).


Docs/Support/make-docbook:
  Change XML/DocBook output to have version #.## instead of #.##-alpha.
Docs/manual.texi:
  Add URL reference to "Enforcing the GPL" article.
  Removed duplicate SQL_BUFFER_RESULT/SQL_SMALL_RESULT texts (reported by Fournier Jocelyn).

Zak's manual fixups.


Docs/Support/colspec-fix.pl:
  Zak's colspec script fixups.
Docs/manual.texi:
  Zak's manual fixups.

Docs/manual.texi:
  Minor SHOW STATUS tweaks.

Docs/manual.texi:
  add-hook -> ad hoc

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

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

sql/slave.cc:
  removed buggy loop
sql/slave.h:
  fixed uninited variable use

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


Docs/manual.texi:
  Auto merged

into kallisto.mysql.com:/home/lenz/work/mysql/mysql-4.0

Rewrote badly phrased sentence; we sell licenses, not the code itself.

into kallisto.mysql.com:/home/lenz/work/mysql/mysql-4.0

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

client/mysqlbinlog.cc:
  fixed options bug. Amazing we've had it there for that long

README:
  Some minor cosmetic/wording corrections
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


Docs/manual.texi:
  Auto merged

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Fulltext TODO updated
myisam/mi_check.c:
  typo in #ifdef fixed

Docs/manual.texi:
  More SQL keyword capping.

Docs/manual.texi:
  More SQL keyword capping.

  Reduce ibdata1 default size to 10M:autoextend


sql/ha_innodb.cc:
  Reduce ibdata1 default size to 10M:autoextend

  Update manual on ON DELETE CASCADE


Docs/manual.texi:
  Update manual on ON DELETE CASCADE

  Update manual on ON DELETE CASCADE


Docs/manual.texi:
  Update manual on ON DELETE CASCADE

Docs/manual.texi:
  More keyword capping.

Docs/manual.texi:
  More keyword capping.

Docs/manual.texi:
  Starting to capitalize SQL keywords in examples.

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

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

manual.texi	@code{master.info} -> @file{master.info}
manual.texi	@code{my.cnf} -> @file{my.cnf}


Docs/manual.texi:
  Tweaks to replication section.

Docs/manual.texi:
  The transaction level is required, not optional.

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


Docs/manual.texi:
  Auto merged

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


Docs/manual.texi:
  Auto merged

Docs/internals.texi:
  fulltext chapter added
Docs/manual.texi:
  news updated
BitKeeper/etc/ignore:
  Added Docs/internals.info to the ignore list
myisam/ft_boolean_search.c:
  weighting scheme changed

manual.texi	Use thread-safe consistently, not a mixture of
manual.texi	thread safe and thread-safe.


Docs/manual.texi:
  Ditto for fail safe and fail-safe (use fail-safe).

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


Docs/manual.texi:
  Auto merged