acinclude.m4:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.cc:
  Auto merged

Docs/manual.texi:
  Added section "Problems with character sets"
acinclude.m4:
  Fixed typos
include/m_ctype.h:
  Made some declarations global
sql/gen_lex_hash.cc:
  Smaller array

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

Fixed bug in JOIN


Docs/manual.texi:
  Changlog
mysql-test/r/join.result:
  New test for join bug
mysql-test/r/null_key.result:
  Fix result after fixing join bug
mysql-test/t/join.test:
  New test for join bug
mysys/my_open.c:
  Fixed bug in counting open files when using many files.
sql/sql_select.cc:
  Fixed join bug

Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors


BUILD/compile-pentium-debug-max:
  Don't use openssl by default
Docs/manual.texi:
  Cleanup of MERGE tables, Access usage and UDF functions
acinclude.m4:
  Cleanup ssl usage
configure.in:
  Added message when using --with-tools
include/mysql_com.h:
  Move MAX_BLOB_WIDTH to be global
myisammrg/myrg_create.c:
  Fix problem with MERGE TABLES and INSERT
myisammrg/myrg_static.c:
  Fix problem with MERGE TABLES and INSERT
mysql-test/r/bigint.result:
  Added test of unsigned BIGINT
mysql-test/r/merge.result:
  Tests for INSERT
mysql-test/r/type_ranges.result:
  Fixed tests for unsigned bigint
mysql-test/t/bigint.test:
  Added test of unsigned BIGINT
mysql-test/t/merge.test:
  Tests for INSERT
mysys/typelib.c:
  Cleanup
sql/field.h:
  Fixed unsigned BIGINT
sql/ha_berkeley.cc:
  Cleanup
sql/ha_gemini.cc:
  Cleanup
sql/ha_myisam.cc:
  Cleanup
sql/ha_myisammrg.cc:
  Fixed INSERT into MERGE tables
sql/item.cc:
  Fixed unsigned BIGINT
sql/item.h:
  Fixed unsigned BIGINT
sql/item_func.cc:
  Fixed unsigned BIGINT
sql/item_strfunc.cc:
  Fixed spelling errors
sql/item_sum.cc:
  Fixed unsigned BIGINT
sql/item_sum.h:
  Fixed unsigned BIGINT
sql/mf_iocache.cc:
  Fixed spelling errors
sql/mysql_priv.h:
  Moved MAX_BLOB_WIDTH to be global
sql/mysqld.cc:
  Fixed spelling errors
sql/opt_range.cc:
  Fixed spelling errors
sql/sql_base.cc:
  Fixed bug in SHOW OPEN TABLES
sql/sql_insert.cc:
  Fixed spelling errors
sql/sql_lex.h:
  Fixed spelling errors
sql/sql_parse.cc:
  Fixed spelling errors
sql/sql_select.cc:
  Fix for unsigned BIGINT
sql/structs.h:
  Fixed spelling errors
sql/time.cc:
  Fixed spelling errors
sql/unireg.cc:
  Fixed spelling errors

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

acinclude.m4:
  Fixed typo in configure
scripts/mysql_fix_privilege_tables.sh:
  Use CREATE TABLE IF EXISTS to avoid warnings
sql/udf_example.cc:
  Fixed that avgcost() is compiled properly.
  Added more comments

Docs/manual.texi:
  typo fixes.

Docs/manual.texi:
  typo fixes.

Docs/manual.texi:
  correct date error in tutorial.

Docs/manual.texi:
  correct date error in manual.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

and free the main thread of the service.


sql/mysqld.cc:
  Time out to permit the clean shutdown of the server
sql/nt_servc.cc:
  Time out and free the main thread of the service.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/gen_lex_hash.cc:
  Smaller array

Fixes for embedded libary and openssl


BUILD/compile-pentium-debug-max:
  Added --with-openssl
acinclude.m4:
  Cleanup
client/client_priv.h:
  Include mysql_embed.h to remove not used functions in embedded server
client/mysql.cc:
  Don't use openssl with embedded server
include/Makefile.am:
  Move mysql_embed.h to 'include' directory
include/myisammrg.h:
  Added support of INSERT to MERGE tables
include/mysql.h:
  Fixes for embedded libary and openssl
include/mysql_com.h:
  Fixes for embedded libary and openssl
include/mysql_embed.h:
  Fixes for embedded libary and openssl
include/violite.h:
  Cleanup
libmysql/libmysql.c:
  Safety
libmysqld/examples/Makefile.am:
  Fixes for embedded libary and openssl
libmysqld/lib_sql.cc:
  Fixes for embedded libary and openssl
libmysqld/lib_vio.c:
  Fixes for embedded libary and openssl
libmysqld/libmysqld.c:
  Fixes for embedded libary and openssl
myisammrg/Makefile.am:
  Added support of INSERT to MERGE tables
myisammrg/myrg_create.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_open.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_static.c:
  Added support of INSERT to MERGE tables
mysql-test/t/union.test:
  Portability fix
sql/Makefile.am:
  Fixes for embedded libary and openssl
sql/gen_lex_hash.cc:
  Added support of INSERT to MERGE tables
sql/ha_myisammrg.cc:
  Added support of INSERT to MERGE tables
sql/handler.h:
  Added support of INSERT to MERGE tables
sql/mini_client.cc:
  Fixes for embedded libary and openssl
sql/net_serv.cc:
  Fixes for embedded libary and openssl
sql/sql_show.cc:
  Cleanup
Build-tools/Do-all-build-steps:
  Don't build openssl (Need to add proper configure test when to build ssl)
sql/lex.h:
  Added support of INSERT to MERGE tables
sql/sql_yacc.yy:
  Fixes for embedded libary and openssl

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


innobase/include/univ.i:
  Auto merged

Docs/manual.texi:
  Auto merged

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0

sql/lex.h:
  Typo fix
sql/sql_yacc.yy:
  Typo fix

Build-tools/Do-all-build-steps:
  We need to test SSL stuff. Now we do it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Update

  Add a mirror in Mexico
mexico.txt, mexico.eps, mexico.gif:
  new file


Docs/manual.texi:
  Add a mirror in Mexico

Changed --do-pstack to --enable-pstack
Removed pstack from default build


client/Makefile.am:
  Fixes for distributed build
configure.in:
  Removed pstack from default build
sql/Makefile.am:
  Fixes for distributed build
sql/mysqld.cc:
  Changed --do-pstack to --enable-pstack

Fixed bug in UNION


client/mysqlbinlog.cc:
  Added error message handling to read_log_event()
heap/hp_write.c:
  More debug info
myisam/myisampack.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Portability fixes.
mysql-test/r/union.result:
  More tests cases for UNION
mysql-test/t/union.test:
  More tests cases for UNION
sql/Makefile.am:
  Added mysql_embed.h
sql/item.cc:
  Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
  Removed use of ## construct (Portability problem)
sql/log_event.h:
  Added error message handling to read_log_event()
sql/mysql_priv.h:
  Added mysql_embed.h
sql/opt_sum.cc:
  Cleanup
sql/slave.cc:
  cleanup
sql/sql_base.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
  Cleanup
sql/table.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
  Integrated table->ref_primary_key into table->part_of_key

innobase/os/os0sync.c:
  Define os_fast_mutex functions also in Windows

os0sync.ic	Define os_fast_mutex functions also in Windows


innobase/include/os0sync.h:
  Define os_fast_mutex functions also in Windows
innobase/include/os0sync.ic:
  Define os_fast_mutex functions also in Windows

univ.i  	Changes to eliminate unnecessary Purify warnings (documentation of flag UNIV_SET_MEM_TO_ZERO)


innobase/include/univ.i:
  Changes to eliminate unnecessary Purify warnings (documentation of flag UNIV_SET_MEM_TO_ZERO)

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

ut0mem.h	Changes to eliminate unnecessary Purify warnings
ut0mem.ic	Changes to eliminate unnecessary Purify warnings
srv0start.c	Changes to eliminate unnecessary Purify warnings
mem0pool.c	Changes to eliminate unnecessary Purify warnings
ut0mem.c	Changes to eliminate unnecessary Purify warnings


innobase/ut/ut0mem.c:
  Changes to eliminate unnecessary Purify warnings
innobase/mem/mem0pool.c:
  Changes to eliminate unnecessary Purify warnings
innobase/srv/srv0start.c:
  Changes to eliminate unnecessary Purify warnings
innobase/include/ut0mem.h:
  Changes to eliminate unnecessary Purify warnings
innobase/include/ut0mem.ic:
  Changes to eliminate unnecessary Purify warnings
innobase/include/mem0mem.ic:
  Changes to eliminate unnecessary Purify warnings

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


acinclude.m4:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged

acinclude.m4:
  Fix for Gemini
sql-bench/server-cfg.sh:
  Fix for Gemini
sql/field.cc:
  Fix for Gemini

Makefile.am	SUBDIRS = aout
configure.in	Output pstack/aout/Makefile
Makefile.am	BitKeeper file /home/tim/my/4/pstack/aout/Makefile.am


configure.in:
  Output pstack/aout/Makefile
pstack/Makefile.am:
  SUBDIRS = aout
libmysqld/examples/Makefile.am:
  Add @pstack_libs@

into work.mysql.com:/home/tim/my/4

Docs/manual.texi:
  New information about the embedded MySQL server
  library.

sql/sql_select.cc:
  Auto merged

myisam/mi_write.c:
  cleanup
pstack/Makefile.am:
  Fixed wrong variable

Docs/manual.texi:
  Auto merged
myisam/mi_check.c:
  Auto merged

Docs/internals.texi:
  Added more code style suggestions.
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Removed dbug info