sql/sql_acl.cc:
  SSL stuff

sql/sql_acl.cc:
  fixed coredump when running without SSL
tools/Makefile.am:
  mysqlmngd -> mysqlmanager
tools/mysqlmanager.c:
  mngd->manager
BitKeeper/etc/ignore:
  Added tools/mysqlmanager to the ignore list

tools/Makefile.am:
  Didn´ t compile after clone

readline/callback.c:
  warning removed
sql/mysqld.cc:
  Warning removed abut freeing zero pointer

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


BitKeeper/etc/ignore:
  auto-union

BitKeeper/etc/ignore:
  Added linked_tools_sources tools/my_vsnprintf.c tools/mysqlmngd tools/mysys_priv.h to the ignore list
Makefile.am:
  fixes for tools directory
configure.in:
  fixes for tools directory
tools/mysqlmngd.c:
  some bare-bones server code

Removed tens of annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables. 


mysys/mf_casecnv.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
mysys/mf_qsort.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/complete.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/readline.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/vi_mode.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables

BitKeeper/etc/ignore:
  Added vio/test-sslclient vio/test-sslserver to the ignore list
client/mysql.cc:
  Let make mysql client tell user about cipher in use
sql/mini_client.cc:
  Synced SSL stuff with libmysql code
sql/mysqld.cc:
  Preaparations to turn replication SSL on
  Stuff to output SSL variables with SHOW STATUS command
sql/sql_show.cc:
  Stuff to output SSL variables with SHOW STATUS command
sql/structs.h:
  Stuff to output SSL variables with SHOW STATUS command
vio/viossl.c:
  Major modifications
vio/viosslfactories.c:
  SSL fixes

acinclude.m4:
  Added -DCPU flag to compile

into x153.internalnet:/home/tonu/mysql-4.0

extra/resolveip.c:
  Removed warnings about implicit declarations
myisam/mi_open.c:
  Removed warning about unused symbol
mysys/my_compress.c:
  Removed warnings about implicit declaration
mysys/string.c:
  Removed warning about uninitialized variable
strings/ctype.c:
  Removed warning about implicit declaration
vio/test-sslclient.c:
  Testprogram heavy modify
vio/test-sslserver.c:
  Testprogram heavy modify

mysql-test/r/union.result:
  New result for EXPLAIN UNION's
mysql-test/t/union.test:
  No error when EXPLAIN is done on UNION's

client/thread_test.c:
  Removed unused variables warnings
sql/mysqld.cc:
  Fixed freeing null ptr warnings
vio/Makefile.am:
  Make more test programs to compile

BitKeeper/etc/ignore:
  Added libmysqld/ha_innobase.cc to the ignore list
libmysqld/Makefile.am:
  Add ha_innobase.cc to libmysqld.
libmysqld/lib_sql.cc:
  Hack to get shutdown working properly in libmysqld.  Probably
  this is not quite correct.
sql/mini_client.cc:
  Remove name collision in embedded libmysqld.

New definition of WEEK().


Docs/manual.texi:
  Changelog
myisam/mi_cache.c:
  Better logging on error
myisam/mi_open.c:
  Remove usage of my_dup(), as this casued error 127 when reading tables
mysql-test/r/func_time.result:
  More tests for the WEEK/YEARWEEK function
mysql-test/t/func_time.test:
  More tests for the WEEK/YEARWEEK function
sql/time.cc:
  New definition of WEEK

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

trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog

sql/sql_parse.cc:
  cleanup

Added heap_delete_table
Added HA_EXTRA_PREPARE_FOR_DELETE
Added and use my_dup() for faster open of tables.
Removed not working no-mix-table-type


BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
  Delete: =6
heap/hp_clear.c:
  Cleanup
heap/hp_close.c:
  Added delayed delete
heap/hp_create.c:
  Added heap_delete_table
heap/hp_delete.c:
  cleanup
heap/hp_test2.c:
  Added heap_delete_table
include/heap.h:
  Added heap_delete_table
include/my_base.h:
  Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
  Adde my_dup and set_prealloc_root
isam/extra.c:
  Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
  use my_dup
myisam/mi_extra.c:
  use my_dup
myisam/mi_open.c:
  use my_dup
myisam/myisamchk.c:
  use my_dup
myisam/myisamdef.h:
  use my_dup
mysys/Makefile.am:
  my_dup
mysys/hash.c:
  Add hash_replace
mysys/mf_pack.c:
  cleanup
mysys/my_alloc.c:
  Add set_prealloc_root
mysys/my_fstream.c:
  cleanup
mysys/my_lib.c:
  cleanup
mysys/my_seek.c:
  cleanup
sql/ha_heap.cc:
  Uses heap_delete_table()
sql/mysqld.cc:
  Fix SIGHUP usage
  Remove no-mix-table-types
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/sql_base.cc:
  remove no-mix-table-type
sql/sql_parse.cc:
  Fix UNION code

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

delimiters/starters/terminators

started work on server management daemon


mysql-test/r/rpl_log.result:
  fixed result
sql/log_event.cc:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
sql/log_event.h:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators

BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes

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


Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  merged
sql/mini_client.cc:
  merged
sql/mysqld.cc:
  merged
sql/sql_repl.cc:
  merged

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

sql/mini_client.cc:
  alarm around mc_mysql_connect()
sql/mysqld.cc:
  move end_slave() to the earlier part of shutdown
sql/sql_repl.cc:
  retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP

Docs/manual.texi:
  Changelog

  Fixed contributed software link


Docs/manual.texi:
  Fixed contributed software link

  Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/sync/sync0sync.c:
  This inline assmebly does not compile on gcc-2.96 and Intel: remove it

New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.


include/global.h:
  Remove warning on Linux Alpha
include/mysql_com.h:
  Move some C variables inside extern "C" block.
include/mysqld_error.h:
  New error mesages
myisam/mi_write.c:
  cleanup
mysql-test/r/select.result:
  Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
  Test for bug with datetime and where optimization
mysql-test/r/union.result:
  Updated result
mysql-test/t/type_datetime.test:
  New test for datetime
mysql-test/t/union.test:
  More testing of error conditions
sql/item_sum.cc:
  Remove warnings on Linux Alpha
sql/item_sum.h:
  Cleanup
sql/lock.cc:
  Cleaned up global lock handling
sql/log_event.cc:
  Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Fix for global locks
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New errors
sql/share/danish/errmsg.txt:
  New errors
sql/share/dutch/errmsg.txt:
  New errors
sql/share/english/errmsg.txt:
  New errors
sql/share/estonian/errmsg.txt:
  New errors
sql/share/french/errmsg.txt:
  New errors
sql/share/german/errmsg.txt:
  New errors
sql/share/greek/errmsg.txt:
  New errors
sql/share/hungarian/errmsg.txt:
  New errors
sql/share/italian/errmsg.txt:
  New errors
sql/share/japanese/errmsg.txt:
  New errors
sql/share/korean/errmsg.txt:
  New errors
sql/share/norwegian-ny/errmsg.txt:
  New errors
sql/share/norwegian/errmsg.txt:
  New errors
sql/share/polish/errmsg.txt:
  New errors
sql/share/portuguese/errmsg.txt:
  New errors
sql/share/romanian/errmsg.txt:
  New errors
sql/share/russian/errmsg.txt:
  New errors
sql/share/slovak/errmsg.txt:
  New errors
sql/share/spanish/errmsg.txt:
  New errors
sql/share/swedish/errmsg.OLD:
  New errors
sql/share/swedish/errmsg.txt:
  New errors
sql/sql_acl.cc:
  Use thd->host_or_ip
sql/sql_class.cc:
  Use new global lock code
sql/sql_class.h:
  host_or_ip
sql/sql_db.cc:
  host_or_ip
sql/sql_delete.cc:
  Use now global lock code
sql/sql_lex.h:
  Cleanup of not used states and variables
sql/sql_parse.cc:
  Use now global locks.
  Made UNION code more general.
  Change to use thd->hosts_or_ip.
  TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
  Portability fixes.
  Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
  Changes for UNION
sql/sql_show.cc:
  Cleanup
sql/sql_union.cc:
  Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
  Fixes for union

client/mysqlbinlog.cc:
  #include <my_pthread.h> before thr_alarm.h