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


Docs/manual.texi:
  Auto merged

Replaced Gates fun.

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


Docs/manual.texi:
  Auto merged

wrong menues - mostly leftover after grand manual massage - that broke texinfo file structure were removed
"MATCH in SELECT only" line from "MySQL deficiencies" removed


Docs/manual.texi:
  wrong menues - mostly obsolete after grand manual massage - that broke texinfo file structure were removed
  "MATCH in SELECT only" line from "MySQL deficiencies" removed

ft_dump.c	-l option - report word length distribution (for ft_max_word_len_for_sort)


myisam/ft_boolean_search.c:
  bugfix "+(aaa bbb) +ccc"
myisam/ft_dump.c:
  -l option - report word length distribution (for ft_max_word_len_for_sort)

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

BitKeeper/deleted/.del-build-tags~7afb7e785b80f97:
  Delete: build-tags

Docs/manual.texi:
  mysql_store_results() -> mysql_store_result()

mysql-test/r/fulltext.result:
  Update results

Docs/manual.texi:
  Auto merged

Free character sets properly (for embedded).
Add missing mutex in HANDLER CLOSE


Build-tools/Do-compile:
  Update for gcc 3.0
Docs/manual.texi:
  Update for gcc 3.0
myisam/mi_locking.c:
  Fix not critical bug in locking
myisam/myisamdef.h:
  Fix not critical bug in locking
mysys/my_init.c:
  Free character sets properly
mysys/my_seek.c:
  Remove warning
sql-bench/server-cfg.sh:
  Fix benchmarks to run with MySQL
sql/sql_handler.cc:
  Add missing mutex
sql/sql_update.cc:
  Clean up procinfo

Docs/manual.texi:
  Extended section about MySQL states.
client/get_password.c:
  Use stderr instead of stdout when asking for password
tests/mail_to_db.pl:
  Small cleanup
tools/mysqlmanager.c:
  Removed warning

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.