into mysql.com:/space/my/mysql-4.0-automake

Docs/bk.txt:
  instructions for compiling for Win via samba
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  add some options
VC++Files/mysys/mysys.dsp:
  add some options

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


Docs/manual.texi:
  Auto merged

FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache


mysql-test/r/query_cache.result:
  query cache with system database test
mysql-test/t/query_cache.test:
  query cache with system database test
sql/sql_cache.cc:
  fixed query cache with system database
  FN_NO_CASE_SENCE used instead of __WIN__

Docs/manual.texi:
  Document IO_THREAD and SQL_THREAD for SLAVE START/STOP.

mysql-test/Makefile.am:
  small fix based on user's input ..

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

into work.mysql.com:/d1/users/mwagner/work/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added docs about how to clone public 4.1 repository
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Change --full to --all for mysqldump references.

manual.texi	missing from the syntax diagram.


Docs/manual.texi:
  UPDATE description mentioned ORDER BY, but it was
  missing from the syntax diagram.

Docs/manual.texi:
  minor change note cleanups.

client/mysql.cc:
  Made i-am-a-dummy option to be identical with safe-updates.
myisam/myisampack.c:
  Fixed a typo.

into mysql.com:/space/my/mysql-4.0-automake


configure.in:
  Auto merged

VC++Files/client/mysqlclient.dsp:
  Updated the sources files:  < net.c >net_serv.cpp
VC++Files/innobase/innobase.dsp:
  Added configuration for to compile all the dependencies options for the other projects.
VC++Files/libmysql/libmysql.dsp:
  Modified the xcopy command for to avoid an error for waiting the confirmation of the copy
VC++Files/myisampack/myisampack.dsp:
  Updated source location
VC++Files/mysql.dsw:
  Added project files: the embedded static library; my_print_defaults; comp_err
VC++Files/mysqldemb/mysqldemb.dsp:
  Updated flags
VC++Files/mysqlserver/mysqlserver.dsp:
  Updated flags
VC++Files/pack_isam/pack_isam.dsp:
  Updated source location
VC++Files/sql/mysqld.dsp:
  Added UDF and updated flags
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  InnoDB does allow a foreign key constraint name to be specified


Docs/manual.texi:
  InnoDB does allow a foreign key constraint name to be specified

  InnoDB does allow a foreign key constraint name to be specified, though it is not used in any way


Docs/manual.texi:
  InnoDB does allow a foreign key constraint name to be specified, though it is not used in any way

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  behavior -> behaviour

configure.in:
  Auto merged

   up-to-date BK changelog instead of sql/ChangeLog, add LICENSE if
   available)


scripts/make_binary_distribution.sh:
   - Don't include sql/ChangeLog in the binary distribution (it's not
     updated anymore since we've moved to BK)
   - Include the BK ChangeLog from top level directory instead, if it exists
   - also add the LICENSE file to the binary distribution, if it exists
     (required for the non-GPL builds)

Don't require UPDATE_ACL for REPLACE


Docs/manual.texi:
  Changelog
configure.in:
  Fix for building shared libraries with a patched glibc
sql/sql_parse.cc:
  Don't require UPDATE_ACL for REPLACE

Docs/manual.texi:
  Fix a few agreement problems.

 - some additional small fixes
 - added "depcomp" for automake 1.5


acinclude.m4:
   - Removed AC_SYS_LARGEFILE (is in autoconf since v2.50)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - adapted for automake 1.5
   - added AM_PROG_AS
   - replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in
     autoconf since v2.50)
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
include/my_global.h:
   - fix for PPC64
install-sh:
   - applied diffs from install-sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysqld/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
tools/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy

 - added some missing changelog entries to the 4.0.5 changelog
 - applied small fix to configure.in from monty (already applied manually
   to configure.in of the 4.0.4 release source files - not relevant for
   normal builds anyway)


Docs/manual.texi:
   - added missing changelog entries
   - added the 4.0.4 release date
configure.in:
   - bumped up version number to 4.0.5-beta, now that the 4.0.4 builds
     are done
   - applied fix from Monty to be able to build shared libraries even
     when the the static NSS libraries are installed. This patch has already
     been applied to the released 4.0.4 sources to work around a local build
     problem, but has not been checked in yet.

client/mysql.cc:
  Fixed an accidently changed option (--ignore-space) back to
  the original one --ignore-spaces in mysql client. Both syntaxes
  will work.

  Clarified FOREIGN KEY syntax, added a note that CREATE TABLE causes an InnoDB commit if binlogging is used, added InnoDB version history


Docs/manual.texi:
  Clarified FOREIGN KEY syntax, added a note that CREATE TABLE causes an InnoDB commit if binlogging is used, added InnoDB version history

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  undo bad query cache mod.

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


Docs/manual.texi:
  Auto merged