myisam/ft_boolean_search.c:
  Portability fix
mysql-test/mysql-test-run.sh:
  Added slave_net_timeout
mysql-test/r/func_if.result:
  Updated results after merge from 3.23
mysql-test/r/func_test.result:
  Updated results after merge from 3.23
mysql-test/r/innodb.result:
  Updated results after merge from 3.23
mysql-test/r/show_check.result:
  Updated results after merge from 3.23
mysql-test/r/variables.result:
  Updated results after merge from 3.23

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

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

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
  Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

Docs/glibc-2.2.5.patch:
  Updated patch for glibc
Docs/manual.texi:
  Updated 'MySQL server gone away' section
client/mysql.cc:
  Fixed syntax error from last change
mysys/my_thr_init.c:
  Changed EXTRA_DEBUG to EXTRA_DBUG_THREADS
sql-bench/limits/mysql.cfg:
  Update to 4.0.2

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

Added copyright messages to some files that was missing it.


Docs/manual.texi:
  Changelog
dbug/Makefile.am:
  Added missing dbug_analyze.c
dbug/monty.doc:
  Added copyright message
mysql-test/t/func_test.test:
  Moved test of IF to new file
sql/item_cmpfunc.cc:
  Fixed that IF is case insensitive if 2 and 3 arguments are case insensitive.
strings/bfill.c:
  Added copyright message
strings/bmove.c:
  Added copyright message
strings/ctype-ujis.c:
  Added copyright message
strings/strend.c:
  Added copyright message
strings/strstr.c:
  Added copyright message
strings/strxmov.c:
  Added copyright message
strings/strxnmov.c:
  Added copyright message

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