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

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


acinclude.m4:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/structs.h:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.ja.texi:
  e-mail address fixed
include/mysqld_error.h:
  Added 3 new errormessages related to SSL
mysql-test/install_test_db.sh:
  SSL fix
scripts/mysql_install_db.sh:
  mysql.user table changes to conform SSL ACL
sql/lex.h:
  Fixed GRANT+SSL clause
sql/share/czech/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/danish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/dutch/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/english/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/estonian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/french/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/german/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/greek/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/hungarian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/italian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/japanese/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/korean/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/norwegian-ny/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/norwegian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/polish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/portuguese/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/romanian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/russian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/slovak/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/spanish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/swedish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/ukrainian/errmsg.txt:
  Added 3 new errormessages related to SSL
Docs/manual.texi:
  SSL fixes
BUILD/compile-pentium-max:
  SSL was missing here
acinclude.m4:
  typo fix
  alignment fix
client/mysql.cc:
  SSL fixes
client/mysqladmin.c:
  SSL fixes
client/mysqlcheck.c:
  SSL fixes
client/mysqldump.c:
  SSL fixes
client/mysqlimport.c:
  SSL fixes
client/mysqlshow.c:
  SSL fixes
include/mysql.h:
  SSL fixes
include/sslopt-case.h:
  SSL fixes
include/sslopt-longopts.h:
  SSL fixes
include/sslopt-usage.h:
  SSL fixes
include/sslopt-vars.h:
  SSL fixes
include/violite.h:
  SSL fixes
  cleanups
libmysql/libmysql.c:
  SSL fixes
libmysqld/lib_sql.cc:
  SSL fixes
sql/mini_client.cc:
  SSL fixes
sql/mysqld.cc:
  SSL fixes
  cleanup
  new variables to SHOW STATUS
sql/sql_acl.cc:
  SSL fixes
sql/sql_acl.h:
  SSL fixes
sql/sql_lex.h:
  SSL fixes
sql/sql_parse.cc:
  SSL fixes
sql/sql_show.cc:
  New functions added
sql/structs.h:
  New functions added
vio/test-ssl.c:
  SSL fixes
vio/test-sslclient.c:
  SSL fixes
vio/test-sslserver.c:
  SSL fixes
vio/viosocket.c:
  SSL fixes
vio/viossl.c:
  SSL fixes
  cleanup
vio/viosslfactories.c:
  SSL fixes
sql/sql_yacc.yy:
  SSL fixes

libmysql/Makefile.am:
  Change global.h to my_global.h
support-files/mysql.server.sh:
  Fix for empty pid files

Build-tools/Do-rpm:
  Fix for RPM build
acinclude.m4:
  Cleanup
configure.in:
  Cleanup
support-files/mysql.spec.sh:
  Cleanup

Docs/Flags/belgium.gif:
  Change mode to -rw-rw-r--
Docs/Flags/mexico.gif:
  Change mode to -rw-rw-r--
Docs/Flags/philippines.gif:
  Change mode to -rw-rw-r--
Docs/Flags/turkey.gif:
  Change mode to -rw-rw-r--

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added hints and information about ROW_FORMAT

Docs/manual.texi:
  typos

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Fix that postscript generation works again

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