configure.in:
  new configure parameter (now only for embeded server)
include/my_global.h:
  now query cache always included in server, because of problrms with test suit
mysql-test/r/flush.result:
  removed double testing
mysql-test/t/flush.test:
  removed double testing
mysql-test/t/grant_cache.test:
  now it is only memo about query cache
mysql-test/t/query_cache.test:
  now it is only memo about query cache

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

manual.texi	Fix instance where manual uses illegal syntax by
manual.texi	putting comments at end of lines.


Docs/manual.texi:
  Option file comments must be on their own lines.
  Fix instance where manual uses illegal syntax by
  putting comments at end of lines.

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


Docs/manual.texi:
  Auto merged
sql/handler.cc:
  Auto merged
sql/table.h:
  Auto merged

mysql-test/r/innodb_cache.result:
  new test for query cache with transactions
mysql-test/t/innodb_cache.test:
  new test for query cache with transactions
sql/sql_cache.cc:
  processing trunsactional tables in query cache & removing strlen
sql/sql_class.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_class.h:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_parse.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/table.h:
  removing strlen operation from query cache

Docs/manual.texi:
  Changelog
myisam/ft_boolean_search.c:
  Portability fix
sql/ha_myisam.cc:
  Cleanup
sql/sql_union.cc:
  cleanup

Decrease net_buffer_length to not get problems when running against mysqld with same max_allowed_packet

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

client/mysql.cc:
  Cleaned up a bit.

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

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


Docs/manual.texi:
  Auto merged

BitKeeper/etc/ignore:
  Added Docs/manual.de.log to the ignore list

manual.texi	- make mysql_data_seek() second argument match
manual.texi	  prototype in mysql.h.
manual.texi	- fix missing @xref parens in function names.
manual.texi	- mysql_change_user(), mysql_character_set_name()
manual.texi	  were out of order in C API section.


Docs/manual.texi:
  make mysql_debug() argument match prototype in mysql.h.

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


Docs/manual.texi:
  Auto merged

manual.texi	description
manual.texi	add missing mysql_server_end() prototype
manual.texi	add missing mysql_thread_end() prototype
manual.texi	add missing mysql_thread_init() prototype
manual.texi	add missing my_init() prototype


Docs/manual.texi:
  clarify ambiguous "it" in mysql_escape_string()
  description

Docs/manual.texi:
  remove apparently-errant half-phrase

  Fix an error in the manual: also BDB and InnoDB tables can have indexes on columns which can have NULLs


Docs/manual.texi:
  Fix an error in the manual: also BDB and InnoDB tables can have indexes on columns which can have NULLs

Docs/Makefile.am:
  Cleaned up rules.