include/my_pthread.h:
  Consolidated NetWare pthread_exit() changes.
mysys/mf_path.c:
  NetWare needs a semicolon path delimiter.
mysys/my_pthread.c:
  Consolidated NetWare pthread_exit() changes.
sql/mini_client.cc:
  Modified to match my_connect().
sql/mysqld.cc:
  Consolidated NetWare pthread_exit() changes.
sql/slave.cc:
  Consolidated NetWare pthread_exit() changes.
sql/sql_load.cc:
  Stat properites should not be checked here on NetWare.

netware/mysql.xdc:
  Change mode to -rw-rw-r--
netware/BUILD/compile-AUTOTOOLS:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-linux-tools:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-END:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-START:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-all:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-debug:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-standard:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwasmnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwccnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwldnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/nwbootstrap:
  Add target path suffix

  When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0


sql/ha_innodb.cc:
  When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0

  Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown


innobase/srv/srv0srv.c:
  Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown

  Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient


innobase/srv/srv0srv.c:
  Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient

  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table


sql/ha_innodb.cc:
  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table
sql/ha_innodb.h:
  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table

mysql-test/r/select_safe.result:
  Updated results
mysql-test/t/select_safe.test:
  Added test for SQL_BIG_SELECTS
sql/set_var.cc:
  Fixed bug in SQL_BIG_SELECTS
sql/share/czech/errmsg.txt:
  Updated error messages
sql/share/danish/errmsg.txt:
  Updated error messages
sql/share/dutch/errmsg.txt:
  Updated error messages
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Updated error messages
sql/share/french/errmsg.txt:
  Updated error messages
sql/share/german/errmsg.txt:
  Updated error messages
sql/share/greek/errmsg.txt:
  Updated error messages
sql/share/hungarian/errmsg.txt:
  Updated error messages
sql/share/italian/errmsg.txt:
  Updated error messages
sql/share/japanese/errmsg.txt:
  Updated error messages
sql/share/korean/errmsg.txt:
  Updated error messages
sql/share/norwegian-ny/errmsg.txt:
  Updated error messages
sql/share/norwegian/errmsg.txt:
  Updated error messages
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Updated error messages
sql/share/russian/errmsg.txt:
  Updated error messages
sql/share/slovak/errmsg.txt:
  Updated error messages
sql/share/spanish/errmsg.txt:
  Updated error messages
sql/share/swedish/errmsg.txt:
  Updated error messages
sql/share/ukrainian/errmsg.txt:
  Updated error messages

(There was a problem on some AMD system when the floating point precision wasn't accurate enough)


mysql-test/r/group_by.result:
  new test result
mysql-test/t/group_by.test:
  Changed test slightly to make it repeatable

sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Added query_cache_size
support-files/my-large.cnf.sh:
  Added query_cache_size

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

from Monty.

Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT


BitKeeper/deleted/.del-.cvsignore~7e29af89a3559f4c:
  Delete: Images/.cvsignore
BitKeeper/deleted/.del-README~d5a4e7ca3a2e87a9:
  Delete: repl-tests/README
BitKeeper/deleted/.del-run-all-tests~4deb6479a13e4568:
  Delete: repl-tests/run-all-tests
BitKeeper/deleted/.del-run.test~3dc5b9bd1e9feea5:
  Delete: repl-tests/test-repl-alter/run.test
BitKeeper/deleted/.del-run.test~4020771cff278f14:
  Delete: repl-tests/test-bad-query/run.test
BitKeeper/deleted/.del-run.test~452f2b66537404a8:
  Delete: repl-tests/test-dump/run.test
BitKeeper/deleted/.del-run.test~b1f0c1f96554df8:
  Delete: repl-tests/test-auto-inc/run.test
BitKeeper/deleted/.del-table-dump-check.master~e13afeb8c79264b5:
  Delete: repl-tests/test-dump/table-dump-check.master
BitKeeper/deleted/.del-table-dump-select.master~744acb955e33f3db:
  Delete: repl-tests/test-dump/table-dump-select.master
BitKeeper/deleted/.del-x.master~29a93ed7956c8693:
  Delete: repl-tests/test-auto-inc/x.master
BitKeeper/deleted/.del-x.master~3b248cbac9abda2b:
  Delete: repl-tests/test-bad-query/x.master
BitKeeper/deleted/.del-foo-dump-master.master~b49ae6bec1e918ee:
  Delete: repl-tests/test-repl/foo-dump-master.master
BitKeeper/deleted/.del-foo-dump-slave.master~f16ed20457d59be9:
  Delete: repl-tests/test-repl/foo-dump-slave.master
BitKeeper/deleted/.del-repl-timestamp.master.reject~3492d2b74b413771:
  Delete: repl-tests/test-repl-ts/repl-timestamp.master.reject
BitKeeper/deleted/.del-repl-timestamp.master~4b7782da5cc13161:
  Delete: repl-tests/test-repl-ts/repl-timestamp.master
BitKeeper/deleted/.del-run.test~a1e32ea1e4253af4:
  Delete: repl-tests/test-repl/run.test
BitKeeper/deleted/.del-run.test~ce5e626c91b760ec:
  Delete: repl-tests/test-repl-ts/run.test
BitKeeper/deleted/.del-sum-wlen-master.master~1a5ea625c79e978:
  Delete: repl-tests/test-repl/sum-wlen-master.master
BitKeeper/deleted/.del-sum-wlen-slave.master~f016d98833433084:
  Delete: repl-tests/test-repl/sum-wlen-slave.master
BitKeeper/deleted/.del-test.master~5829e7b3770179db:
  Delete: repl-tests/test-repl-alter/test.master
BitKeeper/deleted/.del-master-slave.inc~6775f6ae10137c39:
  Delete: repl-tests/include/master-slave.inc
include/my_global.h:
  Fix for purify/valgrind
myisam/mi_info.c:
  Updated comment
mysql-test/r/group_by.result:
  New test results
mysql-test/r/innodb.result:
  New test results
mysql-test/r/join_outer.result:
  New test results
mysql-test/r/multi_update.result:
  New test results
mysql-test/r/null_key.result:
  New test results
mysql-test/r/update.result:
  New test results
mysql-test/t/group_by.test:
  Added extra explain to 'suspicious' test.
mysql-test/t/innodb.test:
  Added test for UPDATE ... ORDER BY
mysql-test/t/join_outer.test:
  Changed test to be repeatable
mysql-test/t/multi_update.test:
  Slight change of test to catch more bugs
mysql-test/t/update.test:
  Better test for UPDATE ... ORDER BY
sql/field.cc:
  Simple optimization
sql/ha_heap.h:
  Added optimzation for clustered index
sql/ha_innodb.cc:
  Added optimzation for clustered index
sql/ha_innodb.h:
  Added optimzation for clustered index
sql/handler.h:
  Added optimzation for clustered index
sql/item_sum.cc:
  Removed some usage of current_thd
sql/mysqld.cc:
  Fix bug when compiling for purify/valgrind
sql/opt_range.cc:
  Added optimzation for clustered index
sql/records.cc:
  Fixed comment
sql/sql_list.h:
  Fixed comment
sql/sql_select.cc:
  Removed some usage of current_thd
sql/sql_select.h:
  Removed some usage of current_thd
sql/sql_union.cc:
  Removed some usage of current_thd
sql/sql_update.cc:
  Fixed bug in UPDATE ... ORDER BY
  Fixed handling of UPDATE ... LIMIT
support-files/my-huge.cnf.sh:
  Added default size for query cache
support-files/my-large.cnf.sh:
  Added default size for query cache

  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