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

Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged

Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged

Changed in client library character-set-dir -> character-sets-dir


Docs/manual.texi:
  Snmall update to ALTER TABLE and MyISAM tables
client/mysql.cc:
  Moved SSL info to 'status'
libmysql/libmysql.c:
  Fixed character-set-dir -> character-sets-dir
sql/sql_string.cc:
  Small optimization

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

  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

Removed blank line that messed up @node relinking (someone committed without testing!)


Docs/manual.de.texi:
  Added @node mysql_thread_safe - needs to be translated!

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

Docs/manual.texi:
  Get rid of non-ASCII (?) character.

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


Docs/manual.texi:
  Auto merged

manual.texi	options table was busted in HTML version).
manual.texi	Minor mods to FLUSH section.
manual.texi	Minor mods to RENAME TABLE section.


Docs/manual.texi:
  Mods to RESET section (syntax description said FLUSH,
  options table was busted in HTML version).

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


Docs/manual.texi:
  Auto merged