BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged

backport things from 4.0. This is safe as the functions are not used!
Fixed bug in new mutex handling in InnoDB
Make allow_break() and dont_break() defines.


Docs/manual.texi:
  Remove -fomit-frame-pointer from default binaries
configure.in:
  Use -lcma library on HPUX
include/my_sys.h:
  Added functions for symbolic link handling to make it possible to
  backport things from 4.0. (This is safe as the functions are not used!)
include/mysys_err.h:
  Error messages for symlink functions.
innobase/include/sync0sync.ic:
  Fixed bug in new mutex handling
mysys/Makefile.am:
  Symlink handling
mysys/errors.c:
  Symlink handling
mysys/mf_brkhant.c:
  Make allow_break() and dont_break() defines.
sql/sql_select.h:
  Fix for Intel compiler.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Docs/manual.texi:
  Added documentation about mysqlcheck

Docs/manual.texi:
  my.cfg -> my.cnf
scripts/safe_mysqld.sh:
  my.cfg -> my.cnf
support-files/mysql-multi.server.sh:
  my.cfg -> my.cnf
support-files/mysql.server.sh:
  my.cfg -> my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into nslinux.bedford.progress.com:/usr1/mikef/MYSQL/there


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged

BUILD/FINISH.sh:
  Add Gemini to configure
Docs/manual.texi:
  Added Gemini content to the manual.
acinclude.m4:
  Add Gemini to configure
configure.in:
  Add Gemini to configure
include/my_base.h:
  transaction isolation level READ UNCOMMITTED does not allow updates
include/mysqld_error.h:
  Added new messages for Lock related failures
sql/field.cc:
  Gemini BLOB support -
sql/field.h:
  Gemini BLOB Support
sql/ha_gemini.cc:
  Gemini Table handler
sql/ha_gemini.h:
  Gemini Table handler
sql/handler.cc:
  Added new messages for Lock related failures
  Provide the ability to turn off recovery for operations like 
  REPAIR TABLE ans ALTER TABLE
sql/handler.h:
  Add a bit to have full text indexes as an option
  and define the prototype to optionally turn on and off logging
sql/lock.cc:
  Added new messages for Lock related failures
sql/share/czech/errmsg.txt:
  Added new messages for Lock related failures
sql/share/danish/errmsg.txt:
  Added new messages for Lock related failures
sql/share/dutch/errmsg.txt:
  Added new messages for Lock related failures
sql/share/english/errmsg.txt:
  Added new messages for Lock related failures
sql/share/estonian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/french/errmsg.txt:
  Added new messages for Lock related failures
sql/share/german/errmsg.txt:
  Added new messages for Lock related failures
sql/share/greek/errmsg.txt:
  Added new messages for Lock related failures
sql/share/hungarian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/italian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/japanese/errmsg.txt:
  Added new messages for Lock related failures
sql/share/korean/errmsg.txt:
  Added new messages for Lock related failures
sql/share/norwegian-ny/errmsg.txt:
  Added new messages for Lock related failures
sql/share/norwegian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/polish/errmsg.txt:
  Added new messages for Lock related failures
sql/share/portuguese/errmsg.txt:
  Added new messages for Lock related failures
sql/share/romanian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/russian/errmsg.txt:
  Added new messages for Lock related failures
sql/share/slovak/errmsg.txt:
  Added new messages for Lock related failures
sql/share/spanish/errmsg.txt:
  Added new messages for Lock related failures
sql/share/swedish/errmsg.txt:
  Added new messages for Lock related failures
sql/sql_base.cc:
  Avoidlock table overflow issues when doing an alter table on Windows.
  This is Gemini specific.
sql/sql_table.cc:
  Add a bit to have full text indexes as an option
  and define the prototype to optionally turn on and off logging
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into donna.mysql.fi:/home/heikki/mysqle

configure.in	If localtime_r not available in Unix, use localtime


innobase/configure.in:
  If localtime_r not available in Unix, use localtime
innobase/ut/ut0ut.c:
  If localtime_r not available in Unix, use localtime

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

Force add of FN_LIBCHAR to symlinks on windows


Docs/manual.texi:
  Cleanup & Changelog
client/mysqladmin.c:
  Added quoting for 'drop database'
client/mysqlcheck.c:
  Fixed wrong comment syntax
libmysql/net.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Better error message.
mysql-test/r/func_test.result:
  test for if()
mysql-test/t/func_test.test:
  test for if()
mysys/mf_pack.c:
  Force add of FN_LIBCHAR to symlinks on windows.
sql/item_cmpfunc.cc:
  Fixed problems with decimals withing IF()
sql/mysqlbinlog.cc:
  Better error messages.
sql/sql_repl.cc:
  Better error messages.

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

Added print of --use-symbolic-links in mysqld


Docs/manual.texi:
  Added new links
configure.in:
  Fixes for gcc
scripts/mysql_config.sh:
  Fixed portability bug.
sql/mysqld.cc:
  Added print of --use-symbolic-links

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

Docs/manual.texi:
  Missed one.

Docs/manual.texi:
  Added mirror. Fixed erroneous @email{} usage.

latvia.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/latvia.gif
latvia.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/latvia.txt


BitKeeper/triggers/post-commit:
  Updated commit address.

configure.in	InnoDB now uses XCHG to implement mutex if GCC and x86


innobase/configure.in:
  InnoDB now uses XCHG to implement mutex if GCC and x86
innobase/include/sync0sync.ic:
  InnoDB now uses XCHG to implement mutex if GCC and x86
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    removed -ffixed-ebp from reckless flags
BUILD/compile-pentium@1.16
    use fast, not reckless flags for binary distribuition
sql/share/english/errmsg.txt@1.24
    Point the user to the manual when he gets aborted connection message



BUILD/SETUP.sh:
  removed -ffixed-ebp from reckless flags
BUILD/compile-pentium:
  use fast, not reckless flags for binary distribuition
sql/share/english/errmsg.txt:
  Point the user to the manual when he gets aborted connection message
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Updated Contrib section, mirrors.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/ut/ut0ut.c:
  Rewrote ut_print_timestamp with localtime_r and in Win GetLocalTime

srv0start.c	InnoDB now prints timestamp at startup and shutdown
ut0ut.h 	InnoDB now prints timestamp at startup and shutdown
ut0ut.c 	InnoDB now prints timestamp at startup and shutdown


innobase/ut/ut0ut.c:
  InnoDB now prints timestamp at startup and shutdown
innobase/include/ut0ut.h:
  InnoDB now prints timestamp at startup and shutdown
innobase/srv/srv0start.c:
  InnoDB now prints timestamp at startup and shutdown
innobase/log/log0log.c:
  InnoDB now prints timestamp at startup and shutdown

Docs/manual.texi:
  Add instructions for innodb_unix_file_flush_method and MyISAM->InnoDB conversion

os0file.c	InnoDB now allows parameter innodb_unix_file_flush_method
srv0start.c	InnoDB now allows parameter innodb_unix_file_flush_method


innobase/srv/srv0start.c:
  InnoDB now allows parameter innodb_unix_file_flush_method
innobase/os/os0file.c:
  InnoDB now allows parameter innodb_unix_file_flush_method
innobase/log/log0log.c:
  InnoDB now allows parameter innodb_unix_file_flush_method

into donna.mysql.fi:/home/heikki/mysqle


BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Add links for downloadable menagerie db distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

srv0srv.c	One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h	One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc	One can now specify innodb_unix_file_flush_method in my.cnf


sql/ha_innobase.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixed problem with fuzzy dates.


mysql-test/r/func_time.result:
  Added test of fuzzy dates
mysql-test/t/func_time.test:
  Added test of fuzzy dates
sql/item.cc:
  Fixed bug with fuzzy dates
sql/sql_parse.cc:
  Remove wrong access check for locks.
  (This has to be delayed for 4.0 because there is currently now way
  to check for "any of the following privileges"
Docs/manual.texi:
  Changelog

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

into janikt.pp.saunalahti.fi:/home/my/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged

Small cleanups


Docs/manual.texi:
  Updated how to add new native functions
mysql-test/r/func_crypt.result:
  Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
  Fix for crypt on FreeBSD
mysys/thr_lock.c:
  Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added a link to a GUI.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into threads.polyesthetic.msg:/usr/local/src/my/3

sql/sql_parse.cc:
  Check table access for SQLCOM_LOCK_TABLES.

Docs/manual.texi:
  typo fixes, miscellaneous general cleanup

Docs/manual.texi:
  general typo fixes