client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
acinclude.m4:
  SCCS merged

acinclude.m4:
  automatically detect installation paths of OpenSSL instead of hard-coding
  automatically enable --with-vio if --with-openssl is enabled
client/mysqltest.c:
  fixes for embedded library
libmysqld/Makefile.am:
  md5 is now in mysys
libmysqld/libmysqld.c:
  added my_connect(), but now can be removed - will do in the next
  changeset
mysql-test/include/have_bdb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_gemini.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_innodb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_1.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_2.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/r/bdb.result:
  fix for new format
mysql-test/r/have_openssl.require:
  ssl->openssl
mysql-test/r/innodb.result:
  fix for query logging

client/mysqldump.c:
  Applied patch from Brian Aker. Changed rest of the '#' -comment
  marks to '--' for portability reasons.

Docs/manual.texi:
  change notes cleanup

Docs/manual.texi:
  Fix nodes

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
Optimize IS NULL handling


Build-tools/Do-compile:
  Fix for machines with clocks in an earlier timezone
Docs/manual.texi:
  Fixed typo
acinclude.m4:
  Fixed typo
client/mysqlbinlog.cc:
  Cleanup
client/mysqltest.c:
  Added --compress to test the compressed protocol
configure.in:
  Increment shared library number (because structs changed)
include/mysql.h:
  Optimize structs for Ia64
include/mysql_com.h:
  Optimize structs for Ia64
libmysql/libmysql.c:
  Portability fixes
libmysql/net.c:
  Fix that compressed packets and normal packets looks indentical before calling net_real_write()
  (Needed for query cache)
libmysqld/examples/Makefile.am:
  Portability fix
libmysqld/libmysqld.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Added --compress to test the compressed protocol
mysql-test/t/type_enum.test:
  A
mysys/mf_casecnv.c:
  Portability fixes
mysys/mf_tempfile.c:
  Portability fixes
scripts/make_binary_distribution.sh:
  Add libmysqld to binary distribution
sql-bench/server-cfg.sh:
  Fix for Interbase
sql/item.h:
  Optimize IS NULL handling
sql/item_cmpfunc.cc:
  Optimize IS NULL handling
sql/item_cmpfunc.h:
  Optimize IS NULL handling
sql/item_func.cc:
  cleanup
sql/item_func.h:
  Optimize IS NULL handling
sql/mysql_priv.h:
  c
sql/net_serv.cc:
  Fix that compressed packets and normal packets looks indentical before calling net_real_write()
  (Needed for query cache)

mysql-test/fix-result:
  version update
mysql-test/r/bigint.result:
  post-merge fix
mysql-test/r/join.result:
  post-merge fix
mysql-test/r/merge.result:
  post-merge fix
mysql-test/r/null_key.result:
  post-merge fix
mysql-test/r/rpl000002.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
mysql-test/r/show_check.result:
  post-merge fix
mysql-test/t/rpl000002.test:
  post-merge fix
mysql-test/t/rpl000015.test:
  post-merge fix
mysql-test/t/rpl000016.test:
  post-merge fix

client/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

instrumented the server with DBUG_SYNC_POINT() macro


mysql-test/t/rpl_log.test:
  no change
sql/item_func.cc:
  debug_sync_point()
sql/log_event.cc:
  clead load data file tmpdir on slave on start/stop events
sql/mysql_priv.h:
  DBUG_SYNC_POINT
sql/sql_repl.cc:
  DBUG_SYNC_POINT in Create_file_event

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  merge
  Don't give an error even if one uses master-ssl options and SSL is
  not used.

Build-tools/Do-compile:
  Auto merged

Build-tools/Do-compile:
  Cleanups
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Build-tools/Do-compile:
  Don't delete distribution if not using --delete
Docs/manual.texi:
  Added information about default values
mysql-test/t/rpl000017.test:
  Fixed replication test to be more portable
mysys/mf_iocache2.c:
  More comments
sql/item_sum.cc:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Fixed typos in output
sql/sql_base.cc:
  Cleanup
sql/sql_delete.cc:
  Cleanup
sql/sql_select.cc:
  Cleanup
sql/uniques.cc:
  Portability fix

Build-tools/Do-compile:
  Remove --no-delete
Docs/manual.texi:
  Udated IA64 section
mysql-test/mysql-test-run.sh:
  Added usage of --master-retry-count
  set LD_LIBRARY_PATH
sql/mysqld.cc:
  Added master-retry-count (needed by mysql-test-run)
sql/slave.cc:
  Added master-retry-count
  Don't write same error to log on retry
sql/slave.h:
  Added master-retry-count (needed by mysql-test-run)

BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/strmake.c:
  Auto merged
mysql-test/t/rpl000017-slave.sh:
  Auto merged

Made replication test portable
Fixed buffer overrun bug in replication


client/Makefile.am:
  Fix for make dist
mysql-test/t/rpl000017-slave.sh:
  Made replication test portable
sql/slave.cc:
  Fixed buffer overrun bug
strings/strmake.c:
  More documentation

Docs/manual.texi:
  Auto merged

Fixed some problems in SHOW CREATE TABLE
Fixed calculation of checksums in myisamchk


Docs/manual.texi:
  ChangelogWh
client/mysql.cc:
  Added comment
myisam/mi_check.c:
  Fixed calcualtion of checksums
sql/sql_insert.cc:
  Fixed bug in INSERT DELAYED
sql/sql_show.cc:
  Fixed some problems in SHOW CREATE TABLE

into fred.:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster


Docs/manual.texi:
  Cleaned up SSL documentation
client/mysql.cc:
  Fixes for embedded server
client/mysqltest.c:
  Fixes for embedded server
  Removed memory and file leaks
include/my_global.h:
  Added C_MODE_START / C_MODE_END macros
include/my_sys.h:
  Made key_cache more configurable
include/myisam.h:
  Fixed that one can change MyISAM key block size
include/mysql.h:
  Fixes for embedded server
libmysql/libmysql.c:
  Cleanup
libmysqld/Makefile.am:
  Cleanup
libmysqld/examples/test-run:
  Added --debug
libmysqld/lib_sql.cc:
  Cleanup
libmysqld/libmysqld.c:
  Cleanup
myisam/ft_boolean_search.c:
  Optimized mi_key_cmp to be faster
myisam/ft_nlq_search.c:
  Optimized mi_key_cmp to be faster
myisam/ft_search.c:
  Optimized mi_key_cmp to be faster
myisam/mi_changed.c:
  Optimized mi_key_cmp to be faster
myisam/mi_check.c:
  Optimized mi_key_cmp to be faster
myisam/mi_create.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_delete.c:
  Optimized mi_key_cmp to be faster
myisam/mi_delete_all.c:
  Optimized mi_key_cmp to be faster
myisam/mi_dynrec.c:
  Speed optimizations
myisam/mi_info.c:
  Speed optimizations
myisam/mi_key.c:
  Speed optimizations
myisam/mi_locking.c:
  Speed optimizations
myisam/mi_open.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_page.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_range.c:
  Speed optimizations
myisam/mi_rkey.c:
  Speed optimizations
myisam/mi_rnext.c:
  Speed optimizations
myisam/mi_rnext_same.c:
  Speed optimizations
myisam/mi_rprev.c:
  Speed optimizations
myisam/mi_rsame.c:
  Speed optimizations
myisam/mi_search.c:
  Speed optimizations
myisam/mi_static.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_statrec.c:
  Speed optimizations
myisam/mi_test2.c:
  Added more test options
myisam/mi_test_all.res:
  Added more test options
myisam/mi_test_all.sh:
  Added more test options
myisam/mi_write.c:
  Speed optimizations
myisam/myisamchk.c:
  Added options to change block size and repair checksums
myisam/myisamdef.h:
  Speed optimizations
mysys/Makefile.am:
  Added bit handling functions
mysys/mf_keycache.c:
  Made key_cache more configurable
mysys/my_init.c:
  made my_init_done global
scripts/mysql_fix_privilege_tables.sh:
  Fixes for SSL
scripts/mysql_install_db.sh:
  Fixes for SSL
sql/derror.cc:
  Don't call exit, call unireg_abort()
sql/item_cmpfunc.cc:
  Speed optimizations
sql/item_cmpfunc.h:
  Speed optimizations
sql/mysql_priv.h:
  Fixes for embedded server
sql/mysqld.cc:
  Fixes for embedded server

Initial cleanup of SSL/X509 explanation.


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

Docs/manual.texi:
  Fix typo in support section.

Docs/manual.texi:
  Fix some details of the Support and Licensing section.

server_start/server_stop
changed rpl000018 to use the new server restart feature instead of a
hack


BitKeeper/deleted/.del-rpl000018-master.sh~bc8072e13b26b005:
  Delete: mysql-test/t/rpl000018-master.sh
client/mysqltest.c:
  server_start/server_stop
mysql-test/mysql-test-run.sh:
  tell mysqltest about the manager
mysql-test/r/rpl000018.result:
  fixed bug
mysql-test/t/rpl000018.test:
  use server restart instead of fake binlog hack
sql/log_event.cc:
  so far useless change

pricing and support levels are given.  Also some style changes.


Docs/manual.texi:
  Re-arrange support information so that no details about
  pricing and support levels are given.  Also some style
  changes ("email" -> "e-mail", fix parentheses).

  Added a mirror in France


Docs/manual.texi:
  Added a mirror in France

  Add a mirror


Docs/manual.texi:
  Add a mirror

strings/Makefile.am:
  Add missing ctype-latin1_de.cc

mysql-test/r/show_check.result:
  Tests for SHOW CREATE TABLE
mysql-test/t/show_check.test:
  Tests for SHOW CREATE TABLE
sql/table.cc:
  More debugging
Docs/manual.texi:
  Added information about MRG_MYISAM

include/violite.h:
  Moved wrong endif line
libmysqld/lib_sql.cc:
  Cleanup
sql/sql_acl.cc:
  cleanup openssl code
sql/mysqld.cc:
  Don't exit() when ending the embedded library