with InnoDB support when requested to do so)


Build-tools/Do-compile:
   - only build with InnoDB, if requested to do so (required to be able
     to build 4.0 "Classic" packages without InnoDB support)
   - Enhanced the failure report message subject a little

  Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES


sql/ha_innodb.cc:
  Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES

mysys/my_symlink.c:
  More debug info

Docs/manual.texi:
  Qcache not available on Windows until 4.0.4.

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

into mysql.com:/home/nick/mysql/repository/mysql-4.0

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  SCCS merged

Accept zero dates without warnings


Docs/manual.texi:
  ChangeLog
sql/sql_acl.cc:
  Compare hostnames case insensitive
sql/time.cc:
  Accept zero dates without warnings

  Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log


sql/ha_innodb.cc:
  Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log
sql/ha_innodb.h:
  Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log

  Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc


sql/ha_innodb.h:
  Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
sql/ha_innodb.cc:
  Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc

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


Docs/manual.texi:
  Auto merged

 - mysql.spec.sh: MySQL-Max now requires MySQL >= 4.0 to avoid version
   mismatches (people were mixing MySQL 3.23 and 4.0 RPMs)


Docs/manual.texi:
   - Added Changelog entry
support-files/mysql.spec.sh:
   - MySQL-Max now requires MySQL >= 4.0 to avoid version mismatching

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

myisam/mi_check.c:
  cleanups

   and applied some cosmetical fixes


Docs/manual.texi:
   - added missing 4.0.4 Changelog entries
   - minor cleanups of the 4.0.4 changes

manual.texi	and QUICK are not mutually exclusive).


Docs/manual.texi:
  DELETE grammer was not quite right (LOW_PRIORITY
  and QUICK are not mutually exclusive).

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:
  Add missing plural

mysql-test/r/order_by.result:
  Added new test
mysql-test/t/order_by.test:
  Added new test

Docs/manual.texi:
  Auto merged

Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables


Docs/manual.texi:
  Changelog
VC++Files/bdb/bdb.dsp:
  Updated project files for 4.0.4
VC++Files/client/mysqlclient.dsp:
  Updated project files for 4.0.4
VC++Files/innobase/innobase.dsp:
  Updated project files for 4.0.4
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated project files for 4.0.4
VC++Files/mysys/mysys.dsp:
  Updated project files for 4.0.4
VC++Files/perror/perror.dsp:
  Updated project files for 4.0.4
VC++Files/sql/mysqld.dsp:
  Updated project files for 4.0.4
client/mysqldump.c:
  Only write short usage if one starts mysqldump without any options
include/config-win.h:
  Added query cache on windows
libmysql/libmysql.def:
  Removed old depricated functions from windows dll
sql/ha_innodb.cc:
  Added missing defines
sql/set_var.cc:
  Code cleanup
sql/sql_acl.cc:
  Added error message if one can't read privilege tables
sql/sql_cache.h:
  Changed some C linkage functions to C++ functions (portability fix)
sql/sql_class.cc:
  Safety fix

Docs/manual.texi:
  FULLTEXT works with CHAR, too.

   "--gcov" is actually passed as a command line option (to avoid
   failures on systems with no gcov installed)


mysql-test/mysql-test-run.sh:
   - only probe for gcov, if it's actually required

into build.mysql2.com:/home/serg/mysql-4.0

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_yacc.yy:
  merged

  static nss linkingg issue


configure.in:
  static nss linkingg issue
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/rpl_flush_log_loop.result:
  Made results independent of MASTER_PORT and SLAVE_PORT
mysql-test/t/rpl_flush_log_loop.test:
  Made results independent of MASTER_PORT and SLAVE_PORT

configure.in:
   - Added missing line from 4.0 patch for static glibc linking

configure.in:
   - Fixed bug in previous patch for linking against libc (taken from 4.0)

Docs/manual.texi:
  Auto merged