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

fixed typo on sql_repl.cc
added build-tags script for the benefit of the poor, sick, and afflicted, 
as Matt likes to say :-)


Docs/manual.texi:
  replication updates
sql/sql_repl.cc:
  fixed typo in comment

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

on a signal

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  miscellaneous minor cleanups

  Added foreign key def syntax + note that the check is not deferred to trx commit


Docs/manual.texi:
  Added foreign key def syntax + note that the check is not deferred to trx commit

Docs/manual.texi:
  misc. changes, ft-boolean WARNING
myisam/Makefile.am:
  ft_dump enabled
myisam/ft_dump.c:
  updated to new fulltext code

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


sql/mysqld.cc:
  Auto merged

myisam/ft_nlq_search.c:
  comments cleanup

configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
mysql-test/r/fulltext.result:
  SCCS merged
sql/mysqld.cc:
  SCCS merged

First (incomplete) version of transaction and as3ap tests.


BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

LOCATE() is now case sensitive


BUILD/compile-alpha-cxx:
  Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
  Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
  Fix result for new RND function
mysql-test/r/func_math.result:
  Fix result for new RND function
mysql-test/r/func_str.result:
  test of new locate()
mysql-test/t/func_str.test:
  test of new locate()
sql/item_func.cc:
  LOCATE() is now case sensitive
sql/sql_string.cc:
  LOCATE() is now case sensitive
sql/sql_string.h:
  LOCATE() is now case sensitive

mysys/my_seek.c:
  Remove warning

Docs/manual.texi:
  Changelog

sql/mysqld.cc:
  Auto merged