into sarvik.tfr.cafe.ee:/usr/home/jcole/bk/mysql-4.0

  Fixed small bug


Docs/Support/docbook-fixup.pl:
  Fixed small bug

  Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.


Docs/Support/docbook-fixup.pl:
  Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged

myisam/ft_dump.c:
  some help added

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0

  Added a mirror in Spain


Docs/mirrors.texi:
  Added a mirror in Spain

Small improvement to write caching.


Docs/manual.texi:
  Updated Changelog
mysql-test/r/rpl000013.result:
  Fix after merge
mysql-test/r/rpl000016.result:
  Fix after merge
mysys/mf_iocache2.c:
  Small improvement to write caching.
sql/sql_select.cc:
  Removed warning

Docs/manual.texi:
  Auto merged
mysql-test/t/rpl000013.test:
  Auto merged
mysql-test/t/rpl000016.test:
  Auto merged
extra/resolveip.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Portability fixes.


BUILD/compile-alpha-debug:
  Update to newer version
libmysqld/lib_vio.c:
  dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
  Update for new tests
mysql-test/t/symlink.test:
  Update for new test format
mysys/mf_iocache2.c:
  Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
  Update with delete tests
sql/mysqld.cc:
  Updates for amiga
sql/sql_string.cc:
  Fix typo
sql/stacktrace.c:
  Portability fix

fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.


mysql-test/r/rpl000016.result:
  updated test result
mysql-test/t/rpl000013.test:
  test alias bug
mysql-test/t/rpl000016.test:
  test for proper skip when the user messes up
sql/slave.cc:
  proper skip even when the user goofs up
sql/sql_base.cc:
  drop real name, not last used alias in the log

include/my_global.h:
  Remove dbug_assert()  (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
  Fixed that xterm works on Solaris 2.8.
  Fixed printing of errors
mysql-test/r/isam.result:
  Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
  Removed MyISAM test from ISAM test
mysys/my_alloc.c:
  Removed warnings
mysys/my_bitmap.c:
  Use DBUG_ASSERT
mysys/my_pthread.c:
  Use DBUG_ASSERT
mysys/my_seek.c:
  More DBUG
sql/ha_berkeley.cc:
  Use DBUG_ASSERT
sql/ha_innobase.cc:
  Use DBUG_ASSERT
sql/log.cc:
  Use DBUG_ASSERT
sql/opt_range.cc:
  Use DBUG_ASSERT
sql/sql_base.cc:
  Use DBUG_ASSERT
sql/sql_handler.cc:
  Use DBUG_ASSERT
sql/sql_load.cc:
  Cleanup
sql/sql_parse.cc:
  Use DBUG_ASSERT
sql/sql_repl.cc:
  Cleanup
sql/sql_select.cc:
  Use DBUG_ASSERT
tools/mysqlmanager.c:
  Cleanup

Docs/manual.texi:
  Cleanup
extra/resolveip.c:
  Portability fix
man/safe_mysqld.1:
  Cleanup
mysys/mf_iocache2.c:
  Safety fix
scripts/make_binary_distribution.sh:
  Add mysqlbinlog

  Added a mirror in Netherlands


Docs/mirrors.texi:
  Added a mirror in Netherlands

  Fix Australian mirror URL


Docs/mirrors.texi:
  Fix Australian mirror URL

Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.


Docs/manual.texi:
  Changelog
mysql-test/r/null_key.result:
  Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
  Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
  Fixed bug when joining with caching

into volk.internalnet:/home/tonu/mysql-4.0

Changed incomplete testcase to another incomplete testcase which works even if localhost.localdomain is first in /etc/hosts file for 127.0.0.1

sql/sql_acl.cc:
  Debugging added where needed
sql/sql_string.cc:
  Debugging added where needed

Docs/manual.texi:
  Added information about some states in mysqladmin processlist into
  the manual.

client/mysqldump.c:
  Added quoting to XML option. <, >, & and " covered.

mysql-test/r/func_encrypt.result:
  Drop table here too....

mysql-test/t/func_encrypt.test:
  Drop table uncommented again

into volk.internalnet:/home/tonu/mysql-4.0

Update test results for MySQL 4.0


extra/resolveip.c:
  Fix for SCO
mysql-test/r/backup.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
  Update test results for MySQL 4.0
mysys/mf_casecnv.c:
  Patch for SCO
mysys/mf_qsort.c:
  Patch for SCO
mysys/my_compress.c:
  Patch for SCO
strings/ctype.c:
  Patch for SCO

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
sql/sql_repl.cc:
  use local file

Docs/manual.texi:
  Auto merged

Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.


Docs/manual.texi:
  Cleanup
configure.in:
  Version number change
mysql-test/t/backup.test:
  drop used tables
mysql-test/t/bdb-crash.test:
  cleanup
mysys/thr_lock.c:
  cleanup
sql/mysqld.cc:
  safety fix
sql/records.cc:
  Fixed bug where one got an empty set instead of a DEADLOCK error when using
  BDB tables.
sql/sql_table.cc:
  Fix race  condition in ANALYZE TABLE.

Docs/manual.texi:
  Recommend gdb 5.1
sql/lock.cc:
  Add missing exit_cond when waiting to lock_global_read_lock()
sql/sql_select.cc:
  Cleanup

manual.texi	Mac OSX is spelled "Mac OS X".


Docs/manual.texi:
  change note entries require trailing periods.
  Mac OSX is spelled "Mac OS X".

mysys/mf_keycache.c:
  Fixed typo.
sql/records.cc:
  Cleanup

sql/mysqld.cc:
  Auto merged

BitKeeper/deleted/.del-WHITEPAPER~da1226799debcf3f:
  Delete: libmysqld/WHITEPAPER
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Fix things that crashed embedded MySQL
libmysqld/examples/test-run:
  Cleanup of old BDB files.
mysql-test/r/innodb.result:
  Fix for embedded library
mysql-test/t/innodb.test:
  Fix for embedded library
mysys/mf_keycache.c:
  Safety
sql/ha_berkeley.cc:
  Added DBUG statements
sql/ha_innobase.cc:
  Fixed bug for embedded version
sql/ha_innobase.h:
  Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/handler.h:
  Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/mysqld.cc:
  Safety fix
sql/sql_base.cc:
  cleanup
sql/sql_select.cc:
  Fix to use index when doing an ORDER BY on a whole InnoDB table

Docs/manual.texi:
  post-merge fix