into mysql.com:/home/pgulutzan/mysql-4.0

from Monty.

  Enable 'LOAD LOCAL INFILE', for parity with unix binaries.


include/config-win.h:
  Enable 'LOAD LOCAL INFILE', for parity with unix binaries.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

more detailed explanation of record header and column 
storage.


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

unknown event'


client/mysqlbinlog.cc:
  Task 761:'mysqlbinlog should not die when reading
  unknown event'
  The 'force-read' option has been added.
sql/log_event.cc:
  Task 761:'mysqlbinlog should not die when reading
  unknown event'
  The'Unknown_log_event' class has been added
sql/log_event.h:
  Task 761:'mysqlbinlog should not die when reading
  unknown event'
  The 'Unknown_log_event' class has been added.

   Christian Hammers for providing this patch

support-files/my-huge.cnf.sh:
   - removed deprecated "set-variable" keywords from options
support-files/my-large.cnf.sh:
   - removed deprecated "set-variable" keywords from options
support-files/my-medium.cnf.sh:
   - removed deprecated "set-variable" keywords from options
support-files/my-small.cnf.sh:
   - removed deprecated "set-variable" keywords from options

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

   discovering this)

  Give sensible advice to the user if InnoDB notices index corruption


innobase/row/row0mysql.c:
  Give sensible advice to the user if InnoDB notices index corruption

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0


sql/log_event.cc:
  Auto merged

  No buffer pool activity in SHOW INNODB STATUS actually meant no page gets


innobase/buf/buf0buf.c:
  No buffer pool activity in SHOW INNODB STATUS actually meant no page gets

  If HAVE_purify is defined, define UNIV_SET_MEM_TO_ZERO to eliminate Purify warnings


innobase/include/univ.i:
  If HAVE_purify is defined, define UNIV_SET_MEM_TO_ZERO to eliminate Purify warnings

  Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings


innobase/buf/buf0buf.c:
  Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings

  Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
  Initialize active_index to a sensible value: prevent crash if we restore it to the original value after an table scan


sql/ha_innodb.cc:
  Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init

  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes


innobase/log/log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes
sql/ha_innodb.cc:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
sql/ha_innodb.h:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables

  Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor


innobase/row/row0sel.c:
  Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor

  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key


innobase/include/row0mysql.h:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0mysql.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0sel.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
sql/ha_innodb.cc:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

  Better fix for the ON DELETE SET NULL problem


innobase/row/row0ins.c:
  Better fix for the ON DELETE SET NULL problem

  Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations


innobase/row/row0ins.c:
  Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations

  Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next


innobase/row/row0sel.c:
  Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next

sql/ha_myisam.cc:
  Flag added to turn on check sum recounting

into deer.mysql.r18.ru:/home/hf/work/mysql-4.0.erf

BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Delete: VC++Files/libmysql/libmysql.def

sql/sql_list.h:
  We should reset list::last here

  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works


innobase/buf/buf0flu.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0crea.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0load.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/db0err.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/dict0dict.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/row0ins.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/lock/lock0lock.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/os/os0file.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0ins.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0sel.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0upd.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/srv/srv0srv.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
sql/ha_innodb.cc:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

into mashka.mysql.fi:/home/my/mysql-4.0

Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows


include/my_global.h:
  Added replication flags from 4.1
mysql-test/r/func_group.result:
  Added test for SUM(NULL)
mysql-test/t/func_group.test:
  Added test for SUM(NULL)
sql/item_sum.cc:
  Fixed bug in SUM() with NULL:s
sql/item_sum.h:
  Fixed bug in SUM() with NULL:s
sql/mysqld.cc:
  Added option --symbolic-links
  Fixed bug in symbolic link handling on Windows
sql/net_serv.cc:
  Code cleanup
sql/sql_acl.cc:
  Added logging of warnings for failed connections with ssl.
sql/sql_show.cc:
  Changed to use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

   (bug #223)
 - Added more detailed info about how to set up replication


support-files/my-huge.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-large.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-medium.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-small.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added hint and commented out sample about skip-networking option
     (security enhancement)

   (bug #264)

 - added Dummy file Docs/manual_toc.html to make "make dist" happy if the
   real manual.texi has not been copied into Docs/ (which would make sure
   a "real" manual_toc.html would be created
 - fixed symlinking in the bdb subdirectory (docs are not included anyway)
 - added dist-hook to Makefile.am to remove superfluous SCCS directories
   from the source distribution


Makefile.am:
   - added dist-hook to remove superfluous SCCS directories from the source
     distribution
bdb/dist/s_symlink:
   - don't try to create symlinks to nonexisting doc files

 - adjusted LSB run levels to be identical as on Red Hat (2-5)

   libraries always ended up in "dir..", even though they were not supposed
   to be installed anyway (they are only required at link time). Fixed it by
   replacing libs_LIBRARIES with noinst_LIBRARIES for all InnoDB Makefile.am 
   files and by removing "libsdir = " from innobase/include/Makefile.i .


innobase/btr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/buf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/com/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/data/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dict/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dyn/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/eval/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fil/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fsp/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ha/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ibuf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/include/Makefile.i:
   - removed libsdir = ../libs to fix a bug in "make DESTDIR=<dir> install"
     (the libs always got installed in "dir../")
innobase/lock/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/log/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mach/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mtr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/odbc/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/os/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/page/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/pars/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/que/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/read/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/rem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/row/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/srv/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/sync/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/thr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/trx/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/usr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)

   in the sample configuration files
 - reworked the replication options and comments a bit
 - added option "skip-networking" (commented out by default) to the
   sample configuration files (enhancement request from bug report #234)


support-files/my-huge.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-large.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-medium.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)