into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

client/mysqldump.c:
  Fixed a bug in get_one_option(), --set-variable didn't work right.

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


Docs/manual.texi:
  Auto merged

into mysql.com:/my/mysql-4.0

  is supposed to become the central repository for documentation guidelines
- re-fixed wording in configure.in according to Manual style guidelines
  (thanks to Paul for the hint)

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

Docs/manual.texi:
  Auto merged

Fixed slowdown problem on win98
Fixed syntax for ALTER TABLE .. RENAME


Docs/manual.texi:
  changelog
libmysql/libmysql.c:
  Fixed that enable-reads-from-master and repl-parse-query works in option files.
myisam/ft_boolean_search.c:
  Portability fixes
mysys/my_thr_init.c:
  cleanup
sql/sql_base.cc:
  Fixed slowdown problem on win98
sql/sql_delete.cc:
  Removed compiler warnings
sql/sql_insert.cc:
  Removed compiler warnings
sql/sql_update.cc:
  Removed compiler warnings
sql/sql_yacc.yy:
  Fixed syntax for ALTER TABLE .. RENAME
vio/vio.c:
  Added test of OS2
vio/viosocket.c:
  cleanup

Added FIX reminder regarding @multitable in SHOW VARIABLES section.

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


sql/slave.cc:
  Auto merged

Docs/manual.texi:
  Minor tweaks to SHOW VARIABLES section.

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

Docs/manual.texi:
  More SQL keyword capping + misc example format fixups.

manual.texi	wild-card, and wildcard.


Docs/manual.texi:
  Use wildcard consistently, not a mix of wild card,
  wild-card, and wildcard.

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


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Fixup LINK to XREF in xml/docbook output, removing explicit target title.
Docs/manual.texi:
  Fixups from O'Reilly proofread feedback.

Docs/mysqld_error.txt:
  Added new error messages

into hundin.mysql.fi:/my/bk/mysql-4.0


BitKeeper/etc/gone:
  auto-union

BitKeeper/deleted/.del-__math.h~f3855eb411435a06:
  Delete: mit-pthreads/machdep/sco-3.2v5/__math.h
BitKeeper/deleted/.del-__signal.h~3d6f84e96bc1462:
  Delete: mit-pthreads/machdep/sco-3.2v5/__signal.h
BitKeeper/deleted/.del-__stdio.h~b991fad3327275e0:
  Delete: mit-pthreads/machdep/sco-3.2v5/__stdio.h
BitKeeper/deleted/.del-__stdlib.h~6179a0922d90025e:
  Delete: mit-pthreads/machdep/sco-3.2v5/__stdlib.h
BitKeeper/deleted/.del-__string.h~d2cc42eeb5e1666:
  Delete: mit-pthreads/machdep/sco-3.2v5/__string.h
BitKeeper/deleted/.del-__math.h~79d9a37715f2c7fe:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__math.h
BitKeeper/deleted/.del-__signal.h~45332b2a56f62580:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__signal.h
BitKeeper/deleted/.del-__signal.h~5e14827a3b91a6db:
  Delete: mit-pthreads/machdep/sco-3.2v5/posix/__signal.h
BitKeeper/deleted/.del-__signal.h~9bb7b240bec88b2d:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/posix/__signal.h
BitKeeper/deleted/.del-__stdio.h~a81562134446c64c:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__stdio.h
BitKeeper/deleted/.del-__stdlib.h~bcbed6d62d1885ae:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__stdlib.h
BitKeeper/deleted/.del-__string.h~94a2e4f9574bf1e8:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__string.h
BitKeeper/deleted/.del-__time.h~2cde57d8feea7fc8:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__time.h
BitKeeper/deleted/.del-__time.h~a9594bab280ced64:
  Delete: mit-pthreads/machdep/sco-3.2v5/__time.h
BitKeeper/deleted/.del-__unistd.h~5cc4575b5a74066f:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/__unistd.h
BitKeeper/deleted/.del-__unistd.h~99e6f1116d1f920:
  Delete: mit-pthreads/machdep/sco-3.2v5/__unistd.h
BitKeeper/deleted/.del-compat.h~1f7e450a2e18603e:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/compat.h
BitKeeper/deleted/.del-compat.h~3f150ff6223d49be:
  Delete: mit-pthreads/machdep/sco-3.2v5/compat.h
BitKeeper/deleted/.del-dirent.h~13608bf11af98f70:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/dirent.h
BitKeeper/deleted/.del-dirent.h~388af3465ad4680f:
  Delete: mit-pthreads/machdep/sco-3.2v5/dirent.h
BitKeeper/deleted/.del-socket.h~1b409f3f1fcbbf7a:
  Delete: mit-pthreads/machdep/sco-3.2v5/socket.h
BitKeeper/deleted/.del-socket.h~9f78f7e5a7b4a83f:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/socket.h
BitKeeper/deleted/.del-syscall.h~c69bd58eba4d5076:
  Delete: mit-pthreads/machdep/sco-3.2v5/syscall.h
BitKeeper/deleted/.del-syscall.h~d9543a0474656339:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/syscall.h
BitKeeper/deleted/.del-timers.h~4907a958151368ed:
  Delete: mit-pthreads/machdep/sco-3.2v5/timers.h
BitKeeper/deleted/.del-timers.h~d5e694e48990538c:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/timers.h
BitKeeper/deleted/.del-trash.can~7eecac9fc944ade2:
  Delete: mit-pthreads/machdep/sco-3.2v5/trash.can
BitKeeper/deleted/.del-trash.can~9332039abd82a925:
  Delete: mit-pthreads/machdep/i386-sco-3.2v5/trash.can
mit-pthreads/Changes-mysql:
  Added list of deleted files (copyright problem)

Docs/manual.texi:
  Auto merged

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

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