client/mysql.cc:
  Testing commit trigger

Docs/bk.txt:
  Testing non-manual commit

Docs/manual.texi:
  One more.. sorry for the spam. :)

Docs/manual.texi:
  One more test

manual.texi	Testing


Docs/manual.texi:
  Testing
Docs/bk.txt:
  Testing commit

manual.texi	test


Docs/manual.texi:
  testing

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Removed doubled paragraph.

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

manual updated


mysql-test/t/fulltext_update.test:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  updated
mysql-test/mysql-test-run.sh:
  make --gdb to work (as mysql-test-run does not wait for keypress anymore)

Fixed UNION from @subsection to @subsubsection under SELECT.

Inserted note about stable codebase and backwards compatibility in "How stable is MySQL" section.


BitKeeper/etc/ignore:
  Added Docs/#manual.texi# to the ignore list

Docs/Makefile.am:
  Added docbook-fixup.pl.
Docs/manual.texi:
  Fixed small bug.  Removed old commented out part.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

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

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


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged

use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux


client/mysqltest.c:
  added MAX_TABLES variable
libmysql/libmysql.c:
  portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
  fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
  make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
  make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
  64-bit portability fixes
sql/mini_client.h:
  64-bit portability fixes
sql/slave.cc:
  64-bit portability fixes
tools/mysqlmanager.c:
  64-bit portability fixes

mysql-test/r/fulltext_cache.result:
  fixed
mysql-test/r/fulltext_left_join.result:
  fixed
mysql-test/r/fulltext_multi.result:
  fixed
mysql-test/r/fulltext_order_by.result:
  fixed

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


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_cache.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/r/fulltext_left_join.result:
  Auto merged
sql/handler.h:
  Auto merged

fixed bug in master - unregister slaves when they disconnect


client/mysqlmanagerc.c:
  changed default port
include/mysql.h:
  use my_net_*
libmysql/manager.c:
  use my_net_*
mysql-test/mysql-test-run.sh:
  added support for client strace
sql/sql_parse.cc:
  unregister slaves on disconnect
sql/sql_repl.cc:
  unregister slaves on disconnect
sql/sql_repl.h:
  unregister slaves on disconnect
tools/mysqlmanager.c:
  changed to use my_net_*

mysql-test/mysql-test-run.sh:
  Make it default to not use the MySQL manager (until next MySQL release)

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


mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged

a bit more work on failsafe replication


client/mysqltest.c:
  added require_manager support
mysql-test/mysql-test-run.sh:
  added --no-manager
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl000018.test:
  must have manager
mysql-test/t/rpl_failsafe.test:
  must have manager
sql/repl_failsafe.cc:
  more work
sql/repl_failsafe.h:
  more work
sql/slave.cc:
  update replication status for fail-safe replication on different events

client/mysqlmanagerc.c:
  Only use needed include files
libmysql/manager.c:
  cleanup include files
scripts/make_binary_distribution.sh:
  Fixed wrong filename
sql/mysqld.cc:
  cleanup
tools/mysqlmanager.c:
  Read with retrys

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

myisam/ft_boolean_search.c:
  Fixed bug
mysql-test/r/fulltext.result:
  updated for new mysqltest
mysql-test/t/fulltext.test:
  duplicate removed

Docs/internals.texi:
  Added chapter about DBUG tags
sql/sql_db.cc:
  cleanup of DBUG tags
sql/sql_parse.cc:
  cleanup of DBUG tags
sql/table.cc:
  cleanup of DBUG tags
tools/mysqlmanager.c:
  Portability fixes

innobase/configure.in:
  Remove LOCALTIME_R (Already checked in config.h)
innobase/os/os0file.c:
  Fix syntax bug when using HAVE_PREAD/HAVE_PWRITE
mysql-test/r/innodb.result:
  Update results

Docs/manual.texi:
  Added info to foreign key section.
BitKeeper/etc/ignore:
  Added libmysqld/repl_failsafe.cc to the ignore list
libmysqld/Makefile.am:
  Added missing files
mysql-test/r/innodb.result:
  Fixed explain results after new innodb optimizations
support-files/mysql.spec.sh:
  Added missing files

innobase/log/log0log.c:
  Auto merged
mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
sql/handler.cc:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
sql/sql_table.cc:
  Auto merged