mysys/mf_format.c:
  fixed a typo bug

test case included ( drop) - currently fails, along with rpl000009


mysql-test/r/drop.result:
  new test
mysql-test/t/drop.test:
  expose a bug in the new symlink table code
sql/slave.cc:
  turn off symlink bit to avoid a bug
sql/sql_repl.cc:
  turn off symlink bit to avoid a bug

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added bdb/include/rpc_server_ext.h to the ignore list

Makefile.shared	removed automake complaints about "sqlobjects"
.del-violite.c~53d4251a69d3c	Delete: sql/violite.c


BitKeeper/deleted/.del-violite.c~53d4251a69d3c:
  Delete: sql/violite.c
libmysql/Makefile.shared:
  removed automake complaints about "sqlobjects"
libmysql/Makefile.am:
  removed automake complaints about "sqlobjects"

BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/sql_parse.cc:
  Auto merged

myisamchk: Don't force a repair if the only problem was that the
open count wasn't correct.
Added missing error messages.


include/my_sys.h:
  Cleanup comments
libmysql/Makefile.shared:
  Added symlink library.
myisam/mi_check.c:
  Added support for symlinked tables
myisam/mi_delete_table.c:
  Added support for symlinked tables
myisam/mi_open.c:
  Added support for symlinked tables
myisam/mi_rename.c:
  Added support for symlinked tables
myisam/myisamchk.c:
  Added support for symlinked tables.
  Don't force a repair if the only problem was that the open count
  wasn't correct.
pstack/bucomm.c:
  use mkstemp() instead of mytemp()
sql/ha_myisam.cc:
  Added support for symlinked tables
sql/ha_myisam.h:
  Added support for symlinked tables
sql/ha_myisammrg.cc:
  Added support for symlinked tables
sql/handler.cc:
  Added support for symlinked tables
sql/handler.h:
  Added support for symlinked tables
sql/lex.h:
  Added support for symlinked tables
sql/share/czech/errmsg.txt:
  Added missing error messages
sql/share/danish/errmsg.txt:
  Added missing error messages
sql/share/dutch/errmsg.txt:
  Added missing error messages
sql/share/estonian/errmsg.txt:
  Added missing error messages
sql/share/french/errmsg.txt:
  Added missing error messages
sql/share/german/errmsg.txt:
  Added missing error messages
sql/share/greek/errmsg.txt:
  Added missing error messages
sql/share/hungarian/errmsg.txt:
  Added missing error messages
sql/share/italian/errmsg.txt:
  Added missing error messages
sql/share/japanese/errmsg.txt:
  Added missing error messages
sql/share/korean/errmsg.txt:
  Added missing error messages
sql/share/norwegian-ny/errmsg.txt:
  Added missing error messages
sql/share/norwegian/errmsg.txt:
  Added missing error messages
sql/share/polish/errmsg.txt:
  Added missing error messages
sql/share/portuguese/errmsg.txt:
  Added missing error messages
sql/share/romanian/errmsg.txt:
  Added missing error messages
sql/share/russian/errmsg.txt:
  Added missing error messages
sql/share/slovak/errmsg.txt:
  Added missing error messages
sql/share/spanish/errmsg.txt:
  Added missing error messages
sql/share/swedish/errmsg.OLD:
  Added missing error messages
sql/share/swedish/errmsg.txt:
  Added missing error messages
sql/sql_db.cc:
  Added support for symlinked tables
sql/sql_parse.cc:
  Added support for symlinked tables
sql/sql_table.cc:
  Added support for symlinked tables with ALTER TABLE
sql/sql_yacc.yy:
  Added option to create symlinked tables.

into work.mysql.com:/home/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

sql/slave.cc:
  Cleanup up indentation.
  Change to use ER_SAFE() instead of ER().
sql/unireg.h:
  Added ER_SAFE()

Docs/manual.texi:
  Link info change
include/my_sys.h:
  Added functions for symlink support
libmysql/Makefile.shared:
  Added mf_symlink.c to library.
mysys/Makefile.am:
  Added functions for symlink support
mysys/mf_same.c:
  cleanup
mysys/my_symlink.c:
  Added functions for symlink support

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


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

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


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

sql/slave.cc:
  print expected error number
sql/unireg.h:
  sanity check for errno range in ER(X)

BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-vio.h~c62fd2b86c03da7d:
  Delete: include/vio.h
client/Makefile.am:
  Added libvio use
include/mysql_com.h:
  Bugfix
libmysql/net.c:
  mysql_com.h added to make it compile
sql/mini_client.cc:
  mysql_com.h added to make it compile
sql/mysql_priv.h:
  Changed place of inlude to make it compile.
sql/net_serv.cc:
  mysql_com.h added to make it compile

into hundin.mysql.fi:/home/tonu/mysql-4.0


include/mysql_com.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Makefile.am:
  Added vio
include/mysql_com.h:
  Removed ancient defines from Vio++ times
include/violite.h:
  Added vio
libmysql/Makefile.shared:
  Removed sqlobject line with violite.lo
libmysql/libmysql.c:
  Openssl stuff & sons
sql/Makefile.am:
  Added vio
sql/mini_client.cc:
  Added vio
sql/mysqld.cc:
  Added vio
sql/net_serv.cc:
  Added vio
sql/sql_parse.cc:
  Added vio
vio/Makefile.am:
  Removed C++ stuff
vio/vio.c:
  st_vio -> Vio
vio/viosocket.c:
  st_vio -> Vio
vio/viossl.c:
  st_vio -> Vio
vio/viosslfactories.c:
  vio.h-> violite.h

sync0sync.ic	Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word


innobase/include/sync0sync.ic:
  Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word

sync0sync.ic	Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety


innobase/include/sync0sync.ic:
  Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union

Added preliminary handling of symlinks in MyISAM.
When using myisamchk to check tables with --force, don't repair
tables that are marked as 'not closed' if they are ok.
Change fn_format() to use my_real_path and my_symlink


include/myisam.h:
  Added handling of symlinks
myisam/ft_boolean_search.c:
  cleanup
myisam/ft_dump.c:
  cleanup
myisam/mi_check.c:
  Added handling of symlinks.
  When using check and --force, don't repair tables that are marked
  as 'not closed' if they are ok.
myisam/mi_create.c:
  Added handling of symlinks.
myisam/mi_dbug.c:
  Added handling of symlinks.
myisam/mi_info.c:
  Added handling of symlinks.
myisam/mi_open.c:
  Added handling of symlinks.
myisam/mi_search.c:
  cleanup
myisam/myisamchk.c:
  Added handling of symlinks.
myisam/myisamdef.h:
  Added handling of symlinks.
myisam/myisamlog.c:
  Fixed bug when using new trees
myisam/myisampack.c:
  cleanup
mysys/mf_cache.c:
  cleanup
mysys/mf_format.c:
  Change to use my_real_path and my_symlink
mysys/my_alloc.c:
  cleanup
BitKeeper/etc/ignore:
  Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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