Docs/manual.texi:
  minor cleanups

Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN


Docs/manual.texi:
  ChangeLog
include/my_getopt.h:
  Removed compiler warnings
myisam/myisamchk.c:
  Fixes for new getopt
mysql-test/r/explain.result:
  Updated test results
mysql-test/r/innodb.result:
  Updated test results
mysql-test/r/join.result:
  Updated test results
mysql-test/t/innodb.test:
  Updated test results
mysys/default.c:
  Bug fix when using --no-defaults
mysys/my_getopt.c:
  Fixes for new getopt
sql/ha_innodb.cc:
  Sets ref_length to right value (faster rnd_pos() handling).
  Fixed problem with multi-table-delete.
  Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
  Remove not used index from EXPLAIN
sql/sql_cache.cc:
  Fixed core dump bug when not using query cache
sql/sql_select.cc:
  Remove not used index from EXPLAIN

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/hash.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged

Docs/manual.texi:
  changelog
sql/sql_acl.cc:
  Fix REFERENCE -> REFERENCES

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  More information about UNSIGNED BIGINT arithmetic
sql/slave.cc:
  Make binary logs 4G safe
sql/slave.h:
  Make binary logs 4G safe
sql/sql_rename.cc:
  cleanup

  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk


sql/ha_innobase.cc:
  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

Added Docs/Support/make-docbook script, to work without makefile. 


BitKeeper/etc/ignore:
  Added Docs/mysql.xml to the ignore list
Docs/Support/docbook-fixup.pl:
  New changes for DocBook XML output filter.

only.


include/my_getopt.h:
  Added u_max_value as for user definable maximum value for
  a variable in my_getopt.
myisam/myisamchk.c:
  myisamchk now uses my_getopt struct for variables also.
  Variables can be set with -O var=val, --set-variable=var=val and
  --variable=val now.
mysys/getvar.c:
  my_set_changeable_var moved to my_getopt.c
mysys/my_getopt.c:
  Added special prefix --maximum[-variable-name=...] for user
  definable maximum values for variables, among other things.

  Remove French mirror


Docs/mirrors.texi:
  Remove French mirror

  Add more diagnostic code to cath possible memory corruption


innobase/mem/mem0mem.c:
  Add more diagnostic code to cath possible memory corruption

  Fix Yugoslavian mirror name
manual.texi:
  Fix a couple of contributed software links


Docs/manual.texi:
  Fix a couple of contributed software links
Docs/mirrors.texi:
  Fix Yugoslavian mirror name

sql/share/dutch/errmsg.txt:
  Auto merged

Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR


Docs/manual.texi:
  Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
  Added error message.
configure.in:
  Fix for autoconf 2.52
include/my_getopt.h:
  Portability fix.
include/my_global.h:
  Portablity fix.
include/mysqld_error.h:
  New error messages
mysql-test/r/bigint.result:
  Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
  Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
  Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
  Test of unsigned BIGINT values.
sql/item_func.h:
  Optimized Item_int_func() usage.
sql/lock.cc:
  Cleanup comments
sql/log.cc:
  Cleanup
sql/log_event.cc:
  Cleanup and portability fixes.
sql/log_event.h:
  Cleanup and portability fixes.
sql/mini_client.cc:
  Cleanup and portability fixes.
sql/mysqld.cc:
  Fix for queries-per-hour
sql/repl_failsafe.cc:
  Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/slave.cc:
  Cleanup
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Cleanup and removal of possible reserved words
sql/sql_base.cc:
  More DBUG
sql/sql_cache.cc:
  Cleanup & portability fixes
sql/sql_class.h:
  Make binary log 4G clean
sql/sql_delete.cc:
  More DBUG
sql/sql_handler.cc:
  Cleanup & portability fixes
sql/sql_parse.cc:
  Cleanup of queries-per-hours code
sql/sql_rename.cc:
  Add missing DBUG_RETURN
sql/sql_repl.cc:
  Cleanup & portability fixes
sql/sql_select.cc:
  Cleanup & portability fixes
sql/sql_show.cc:
  Cleanup & portability fixes
sql/sql_update.cc:
  Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
  Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
  Cleanup & portability fixes

  Add an assert
dyn0dyn.h:
  Reduce stack consumption


innobase/include/dyn0dyn.h:
  Reduce stack consumption
innobase/include/page0page.ic:
  Add an assert

  Merge InnoDB-.48


sql/ha_innobase.cc:
  Merge InnoDB-.48
innobase/include/dict0dict.h:
  Merge InnoDB-.48
innobase/include/dict0mem.h:
  Merge InnoDB-.48
innobase/include/mem0dbg.h:
  Merge InnoDB-.48
innobase/include/mem0mem.h:
  Merge InnoDB-.48
innobase/include/que0que.h:
  Merge InnoDB-.48
innobase/include/row0mysql.h:
  Merge InnoDB-.48
innobase/include/srv0srv.h:
  Merge InnoDB-.48
innobase/include/trx0sys.h:
  Merge InnoDB-.48
innobase/include/trx0trx.h:
  Merge InnoDB-.48
innobase/include/mem0mem.ic:
  Merge InnoDB-.48
innobase/dict/dict0dict.c:
  Merge InnoDB-.48
innobase/dict/dict0mem.c:
  Merge InnoDB-.48
innobase/log/log0recv.c:
  Merge InnoDB-.48
innobase/mem/mem0dbg.c:
  Merge InnoDB-.48
innobase/mem/mem0mem.c:
  Merge InnoDB-.48
innobase/pars/lexyy.c:
  Merge InnoDB-.48
innobase/que/que0que.c:
  Merge InnoDB-.48
innobase/rem/rem0rec.c:
  Merge InnoDB-.48
innobase/row/row0mysql.c:
  Merge InnoDB-.48
innobase/row/row0sel.c:
  Merge InnoDB-.48
innobase/srv/srv0srv.c:
  Merge InnoDB-.48
innobase/sync/sync0arr.c:
  Merge InnoDB-.48
innobase/trx/trx0sys.c:
  Merge InnoDB-.48
innobase/trx/trx0trx.c:
  Merge InnoDB-.48
innobase/trx/trx0undo.c:
  Merge InnoDB-.48

likely() and unlikely() branch prediction compiler hint macros
clean-up of comments


include/my_global.h:
  added likely() and unlikely() macros to help some compilers optimize
  the code for architecture-specific branch prediction policies
include/my_sys.h:
  coverted my_b_append_tell() from macro to a function as it needed to be more
  complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
  hostname-independent relay log name to have consistent SHOW SLAVE STATUS
  output
mysql-test/r/rpl000014.result:
  result update
mysql-test/r/rpl000015.result:
  result update
mysql-test/r/rpl000016.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/t/rpl000017-slave.sh:
  proper cleanup of old logs
mysys/mf_iocache.c:
  cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
  my_b_append_tell()
  cleanup of comments
sql/log.cc:
  fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
  do not write stop events when the server does not actually stop but just 
  rotates the log
  fixed race between queue_event() and show_slave_status()
  clean-up of comments
sql/slave.h:
  added ignore_stop_event flag to SLAVE_LOG_INFO

Update for autoconf 2.52


BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8:
  Delete: BUILD/compile-pentium-symbols
BUILD/Makefile.am:
  Remove not used scripts
BUILD/SETUP.sh:
  Update needed for SuSE 7.3
BUILD/compile-alpha:
  Update needed for SuSE 7.3
BUILD/compile-pentium-debug-no-bdb:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gcov:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gprof:
  Update needed for SuSE 7.3
BUILD/compile-pentium-mysqlfs-debug:
  Update needed for SuSE 7.3
BUILD/compile-pentium:
  Update needed for SuSE 7.3
Docs/manual.texi:
  changelog
Docs/mysqld_error.txt:
  New error messages.
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
myisam/mi_check.c:
  Fix for myisamchk bug when reparing table with many keys.
myisam/mi_key.c:
  Fix problem with NAN in key's
scripts/Makefile.am:
  Fix for autoconf 2.52
scripts/mysql_new_fix_privilege_tables.sh:
  cleanup

include/Makefile.am:
  Added my_getopt.h
myisam/myisamchk.c:
  myisamcheck is using my_getopt struct now. Old code left:
  changeable_var[], will be changed later.
mysys/Makefile.am:
  added my_getopt.c
mysys/getvar.c:
  Added my_set_changeable_var. This is not being used yet, and
  is mostly a copy of set_changeable_var still.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository


client/mysqltest.c:
  added wait_for_slave_to_stop
  cleaned up TODO and comments
include/my_sys.h:
  fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
  updated result
mysql-test/t/rpl000016.test:
  use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
  fixed race in flush_io_cache()
  fixed failure to unlock mutex in my_b_append()
sql/log.cc:
  be compatible with 3.23 master
sql/log_event.cc:
  3.23 master compat
sql/slave.cc:
  3.23 master compat
sql/sql_class.h:
  compat with 3.23 master

Docs/manual.texi:
  change notes cleanup

client/mysqldump.c:
  Auto merged

Faster 'read_first_row' (Fixes slow 'preparing' state)
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Increase max package length to 512M
client/mysqldump.c:
  Increase max package length to 512M
dbug/dbug.c:
  Fixed wrong printf() format string.
mysql-test/t/innodb.test:
  Test for multi-table delete
sql/handler.cc:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/handler.h:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/opt_range.cc:
  More debug info.
sql/sql_select.cc:
  Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
  This also fixes a complicated bug involving const tables.
sql/sql_select.h:
  Read const tables earlier

into hynda.mysql.fi:/data/my/bk/mysql-4.0-quick-fixes

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager


libmysqld/lib_sql.cc:
  post-merge fix
mysql-test/mysql-test-run.sh:
  fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
sql/log_event.cc:
  post-merge fix
sql/slave.cc:
  post-merge fix
sql/slave.h:
  post-merge fix
sql/sql_class.h:
  post-merge fix
tools/mysqlmanager.c:
  added debug message