Docs/manual.texi:
  Fixed bad merge

Docs/manual.texi:
  Take Jeremy's version; Will patch this with the deleted text

Added prototype for my_thread_end
New error message for MATCH
Give error when using myisamchk --force --readonly


BitKeeper/deleted/.del-fulltext_join.test~e347c8f04405c916:
  Delete: mysql-test/t/fulltext_join.test
Docs/manual.texi:
  Added node to fulltext
configure.in:
  Fix when using --without-server --with-thread-safe-client
include/mysql_com.h:
  Added prototype for my_thread_end
include/mysqld_error.h:
  New error message for MATCH
myisam/myisamchk.c:
  Give error when using --force --readonly
mysql-test/t/fulltext.test:
  Added test for error conditons with fulltext
sql/item_func.cc:
  Fixed error messages when using MATCH ... AGAINST
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  New error message when using MATCH
sql/share/danish/errmsg.txt:
  New error message when using MATCH
sql/share/dutch/errmsg.txt:
  New error message when using MATCH
sql/share/english/errmsg.txt:
  New error message when using MATCH
sql/share/estonian/errmsg.txt:
  New error message when using MATCH
sql/share/french/errmsg.txt:
  New error message when using MATCH
sql/share/german/errmsg.txt:
  New error message when using MATCH
sql/share/greek/errmsg.txt:
  New error message when using MATCH
sql/share/hungarian/errmsg.txt:
  New error message when using MATCH
sql/share/italian/errmsg.txt:
  New error message when using MATCH
sql/share/japanese/errmsg.txt:
  New error message when using MATCH
sql/share/korean/errmsg.txt:
  New error message when using MATCH
sql/share/norwegian-ny/errmsg.txt:
  New error message when using MATCH
sql/share/norwegian/errmsg.txt:
  New error message when using MATCH
sql/share/polish/errmsg.txt:
  New error message when using MATCH
sql/share/portuguese/errmsg.txt:
  New error message when using MATCH
sql/share/romanian/errmsg.txt:
  New error message when using MATCH
sql/share/russian/errmsg.txt:
  New error message when using MATCH
sql/share/slovak/errmsg.txt:
  New error message when using MATCH
sql/share/spanish/errmsg.txt:
  New error message when using MATCH
sql/share/swedish/errmsg.OLD:
  New error message when using MATCH
sql/share/swedish/errmsg.txt:
  New error message when using MATCH

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


Docs/manual.texi:
  Auto merged

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

Docs/manual.texi:
  Fixed some ugly things.

Docs/manual.texi:
  Aesthetic changes.

Docs/manual.texi:
  A few random fixes.

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

Extended default arguments to be up to 4095 characters


Docs/manual.texi:
  Update lof LOCK TABLES
mysql-test/r/order_by.result:
  Test for optimizer bug in ORDER BY
mysql-test/t/order_by.test:
  Test for optimizer bug in ORDER BY
mysys/default.c:
  Extended default arguments to be up to 4095 characters
sql/sql_select.cc:
  Fixed optimizer bug in ORDER BY

Docs/manual.texi:
  merge (need to fix with emacs to get everthing right)

sql/log_event.h:
  do not log stray error codes

Applied patch for mysqlhotcopy
Fixed open-files-size option in safe_mysqld


Docs/manual.texi:
  Updated LOCK TABLES section
scripts/mysqlhotcopy.sh:
  Removed depricated DBI calls.
  Fixed bug which resulted in nothing being copied when a regexp was
  specified but no database name(s).
  Patch by Jeremy D. Zawodny
scripts/safe_mysqld.sh:
  Fixed open-files-size option

Sorry for such a big patch. :)

Fix --core-file-size so that the argument is parsed correctly.


scripts/safe_mysqld.sh:
  Code cleanup.
  Fix --core-file-size so that the argument is parsed correctly.

Remove unused argument to ha_berkeley::remove_key().


mysql-test/r/bdb.result:
  Add test case for update/replace bug in bdb.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
mysql-test/t/bdb.test:
  Add test case for update/replace bug in bdb.
sql/ha_berkeley.cc:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
sql/ha_berkeley.h:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.

ha_berkeley.cc	core dump if cursor was invalid.


sql/ha_berkeley.cc:
  Fix bug in remove_key(), when key != primary_key it would
  core dump if cursor was invalid.

Docs/manual.texi:
  change note cleanups, other misc. typo fixes

Docs/manual.texi:
  bug was described incorrectly

Docs/manual.texi:
  Applied mysqldumslow patch.

sql/share/portuguese/errmsg.txt:
  Updated the translation English->Portuguese.

innobase/row/row0sel.c:
  Remove a possible cause of the Peter Zaitsev hang

dict0dict.ic	Remove acquisition of the dictionary mutex: this may fix the hang observed by Peter Zaitsev
os0file.c	Use O_SYNC instead of O_DSYNC because in Linux there may be a bug


innobase/os/os0file.c:
  Use O_SYNC instead of O_DSYNC because in Linux there may be a bug
innobase/include/dict0dict.ic:
  Remove acquisition of the dictionary mutex: this may fix the hang observed by Peter Zaitsev

innobase/row/row0sel.c:
  Disable a special join speed optimization until Peter Zaitsev's hang is tracked down

innobase/srv/srv0start.c:
  Remove old code

srv0start.c	Support raw disk as a data file
srv0srv.c	Support raw disk as a data file
ha_innobase.cc	Some error messages and support raw disk as a data file


sql/ha_innobase.cc:
  Some error messages and support raw disk as a data file
innobase/srv/srv0srv.c:
  Support raw disk as a data file
innobase/srv/srv0start.c:
  Support raw disk as a data file
innobase/include/srv0srv.h:
  Support raw disk as a data file

Docs/manual.texi:
  SCCS merged