BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changelog

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

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


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

info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are


include/mysql_com.h:
  register slaves
mysql-test/mysql-test-run.sh:
  parameters to test slave registration
mysql-test/r/rpl000002.result:
  test of slave registration
mysql-test/t/rpl000002.test:
  test slave registration
sql/mysql_priv.h:
  slave registration
sql/mysqld.cc:
  slave registration
sql/slave.cc:
  slave registration
sql/slave.h:
  slave registration
sql/sql_lex.h:
  slave registration
sql/sql_parse.cc:
  slave registration
sql/sql_repl.cc:
  slave registration
sql/sql_repl.h:
  slave registration
sql/sql_yacc.yy:
  slave registration

sql/item_strfunc.cc:
  renamed MD5* to my_MD5* to avoid name clashes with openssl library

md5.c   	when linking to it
md5.h   	renamed MD5* to my_MD5* to avoid clashes with openssl library
md5.h   	when linking to it


sql/md5.h:
  renamed MD5* to my_MD5* to avoid clashes with openssl library
  when linking to it
sql/md5.c:
  renamed MD5* to my_MD5* to avoid clashes with openssl library
  when linking to it
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

mysql-test/t/count_distinct2.test:
  make default NULL in tree->MyISAM test to make sure restore_record()
  does not give a bad surprise
sql/item_sum.cc:
  cleanup according to Monty's suggestions
sql/item_sum.h:
  cleanup according to Monty's suggestions

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.

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

include/mysqld_error.h:
  new errors
mysql-test/r/rpl000009.result:
  test load data from master
mysql-test/t/rpl000009.test:
  test load data from master
sql/mini_client.cc:
  extra functionality needed for load data from master and other things
sql/mini_client.h:
  addition to API
sql/mysql_priv.h:
  mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
  more error messages
sql/slave.cc:
  cleanup of fetch_nx_table()
sql/slave.h:
  cleanup of fetch_nx_table()
sql/sql_base.cc:
  remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
  remove unused replication variables
sql/sql_class.h:
  remove unused replication variabled
sql/sql_db.cc:
  make mysql_create_db()/mysql_rm_db() work with thd == 0 
  (do not write messages to the net) and instead return success/error
sql/sql_lex.h:
  added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
  LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
  LOAD DATA FROM MASTER
sql/sql_repl.h:
  LOAD DATA FROM MASTER
sql/sql_yacc.yy:
  LOAD DATA FROM MASTER

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.

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

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

sql/item_sum.cc:
  do not insert into deleted tree in count(distinct)

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

test heap table/tree overflow in count(distinct)


mysql-test/r/count_distinct2.result:
  added test for tree/heap table overflow
mysql-test/t/count_distinct2.test:
  test tree/heap table overflow
sql/item_sum.cc:
  handle tree overflow in count(distinct)
sql/item_sum.h:
  t

from libmysql directory to make things compile


libmysql/Makefile.am:
  symlink sql/violite.c to libmysql/violite.c
libmysql/Makefile.shared:
  fixes for violite.c

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

BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged