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


sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run


include/my_sys.h:
  fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
  fixed missing \ bug
  added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
  do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
  rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
  fixed shutdown bug when singals DO break read introduced by the fix for 
  when they don't.
sql/repl_failsafe.cc:
  fixed memory leak

manual.texi	typo


Docs/manual.texi:
  website -> web site

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  some mods to ch 1 index entries; other minor tweaks

Docs/manual.texi:
  Changelog
mysql-test/r/update.result:
  Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
  Test found bug in UPDATE .. ORDER BY

mysys/my_lib.c:
  Fix for amiga
sql-bench/crash-me.sh:
  Fix wrong comment when testing for transactions

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
mysql-test/r/insert_select.result:
  Add testcase for INSERT IGNORE
mysql-test/t/insert_select.test:
  Add testcase for INSERT IGNORE

Reference fixups.

Extracted appendixes "Testimonials" and "Users" to separate files for safe keeping. Should go to web portals.

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

myisam/ft_boolean_search.c:
  Auto merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

fixes for IO_CACHE
need to pull Monty's fixes - this is not final, will not be pushed


include/my_sys.h:
   IO_CACHE fixes
mysql-test/mysql-test-run.sh:
  manager clean-up
mysys/mf_iocache.c:
  IO_CACHE fix
sql/mysqld.cc:
  more debug messages
tools/mysqlmanager.c:
  added pid-file

myisam/ft_boolean_search.c:
  test

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

Docs/manual.texi:
  Auto merged

BUILD/compile-alpha-cxx:
  Fix for Alpha ccc
configure.in:
  Remove not used libraries
mysql-test/r/innodb.result:
  Fix test case
sql/sql_base.cc:
  Fix wrong memory allocation in SHOW OPEN TABLES.

Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Add timeout for shutdown
mysql-test/r/innodb.result:
  Use local test
mysql-test/t/innodb.test:
  merge

Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Change shutdown to 20 seconds for slow systems
mysql-test/r/innodb.result:
  Testcase for found bug
mysql-test/t/innodb.test:
  Testcase for found bug

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

BitKeeper/triggers/post-commit:
  Changed to docs-commit@