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

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

    added support for quiet
    increased line buffer size
client/mysqltest.c
    fixed memory leak
    added query logging to result file
    added error message logging to result file
    added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh
    converted tests to use mysqlmanager

Updated test results


BitKeeper/etc/ignore:
  added *.reject
client/mysqlmanagerc.c:
  added support for quiet
  increased line buffer size
client/mysqltest.c:
  fixed memory leak
  added query logging to result file
  added error message logging to result file
  added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh:
  converted tests to use mysqlmanager
mysql-test/r/alias.result:
  log queries
mysql-test/r/alter_table.result:
  log queries
mysql-test/r/analyse.result:
  log queries
mysql-test/r/auto_increment.result:
  log queries
mysql-test/r/backup.result:
  log queries
mysql-test/r/bdb-crash.result:
  log queries
mysql-test/r/bench_count_distinct.result:
  log queries
mysql-test/r/bigint.result:
  log queries
mysql-test/r/binary.result:
  log queries
mysql-test/r/bulk_replace.result:
  log queries
mysql-test/r/case.result:
  log queries
mysql-test/r/check.result:
  log queries
mysql-test/r/comments.result:
  log queries
mysql-test/r/compare.result:
  log queries
mysql-test/r/count_distinct.result:
  log queries
mysql-test/r/count_distinct2.result:
  log queries
mysql-test/r/create.result:
  log queries
mysql-test/r/ctype_latin1_de.result:
  log queries
mysql-test/r/delayed.result:
  log queries
mysql-test/r/dirty-close.result:
  log queries
mysql-test/r/distinct.result:
  log queries
mysql-test/r/drop.result:
  log queries
mysql-test/r/empty_table.result:
  log queries
mysql-test/r/explain.result:
  log queries
mysql-test/r/flush.result:
  log queries
mysql-test/r/fulltext.result:
  log queries
mysql-test/r/fulltext_cache.result:
  log queries
mysql-test/r/fulltext_distinct.result:
  log queries
mysql-test/r/fulltext_left_join.result:
  log queries
mysql-test/r/fulltext_multi.result:
  log queries
mysql-test/r/fulltext_order_by.result:
  log queries
mysql-test/r/fulltext_update.result:
  log queries
mysql-test/r/fulltext_var.result:
  log queries
mysql-test/r/func_crypt.result:
  log queries
mysql-test/r/func_date_add.result:
  log queries
mysql-test/r/func_equal.result:
  log queries
mysql-test/r/func_group.result:
  log queries
mysql-test/r/func_in.result:
  log queries
mysql-test/r/func_like.result:
  log queries
mysql-test/r/func_math.result:
  log queries
mysql-test/r/func_misc.result:
  log queries
mysql-test/r/func_op.result:
  log queries
mysql-test/r/func_regexp.result:
  log queries
mysql-test/r/func_set.result:
  log queries
mysql-test/r/func_str.result:
  log queries
mysql-test/r/func_system.result:
  log queries
mysql-test/r/func_test.result:
  log queries
mysql-test/r/func_time.result:
  log queries
mysql-test/r/func_timestamp.result:
  log queries
mysql-test/r/group_by.result:
  log queries
mysql-test/r/handler.result:
  log queries
mysql-test/r/having.result:
  log queries
mysql-test/r/heap.result:
  log queries
mysql-test/r/identity.result:
  log queries
mysql-test/r/ins000001.result:
  log queries
mysql-test/r/insert.result:
  log queries
mysql-test/r/insert_select.result:
  log queries
mysql-test/r/isam.result:
  log queries
mysql-test/r/join.result:
  log queries
mysql-test/r/join_crash.result:
  log queries
mysql-test/r/join_outer.result:
  log queries
mysql-test/r/key.result:
  log queries
mysql-test/r/key_diff.result:
  log queries
mysql-test/r/key_primary.result:
  log queries
mysql-test/r/keywords.result:
  log queries
mysql-test/r/kill.result:
  log queries
mysql-test/r/limit.result:
  log queries
mysql-test/r/lock.result:
  log queries
mysql-test/r/merge.result:
  log queries
mysql-test/r/multi_update.result:
  log queries
mysql-test/r/myisam.result:
  log queries
mysql-test/r/null.result:
  log queries
mysql-test/r/null_key.result:
  log queries
mysql-test/r/odbc.result:
  log queries
mysql-test/r/openssl_1.result:
  log queries
mysql-test/r/openssl_2.result:
  log queries
mysql-test/r/order_by.result:
  log queries
mysql-test/r/order_fill_sortbuf.result:
  log queries
mysql-test/r/raid.result:
  log queries
mysql-test/r/range.result:
  log queries
mysql-test/r/rename.result:
  log queries
mysql-test/r/replace.result:
  log queries
mysql-test/r/rollback.result:
  log queries
mysql-test/r/rpl000001.result:
  log queries
mysql-test/r/rpl000002.result:
  log queries
mysql-test/r/rpl000003.result:
  log queries
mysql-test/r/rpl000004.result:
  log queries
mysql-test/r/rpl000005.result:
  log queries
mysql-test/r/rpl000006.result:
  log queries
mysql-test/r/rpl000007.result:
  log queries
mysql-test/r/rpl000008.result:
  log queries
mysql-test/r/rpl000009.result:
  log queries
mysql-test/r/rpl000010.result:
  log queries
mysql-test/r/rpl000011.result:
  log queries
mysql-test/r/rpl000012.result:
  log queries
mysql-test/r/rpl000013.result:
  log queries
mysql-test/r/rpl000014.result:
  log queries
mysql-test/r/rpl000015.result:
  log queries
mysql-test/r/rpl000016.result:
  log queries
mysql-test/r/rpl000017.result:
  log queries
mysql-test/r/rpl000018.result:
  log queries
mysql-test/r/rpl_get_lock.result:
  log queries
mysql-test/r/rpl_log.result:
  log queries
mysql-test/r/rpl_magic.result:
  log queries
mysql-test/r/rpl_mystery22.result:
  log queries
mysql-test/r/rpl_sporadic_master.result:
  log queries
mysql-test/r/sel000001.result:
  log queries
mysql-test/r/sel000002.result:
  log queries
mysql-test/r/sel000003.result:
  log queries
mysql-test/r/sel000031.result:
  log queries
mysql-test/r/sel000032.result:
  log queries
mysql-test/r/sel000033.result:
  log queries
mysql-test/r/sel000100.result:
  log queries
mysql-test/r/select.result:
  log queries
mysql-test/r/select_found.result:
  log queries
mysql-test/r/select_safe.result:
  log queries
mysql-test/r/show_check.result:
  log queries
mysql-test/r/slave-running.result:
  log queries
mysql-test/r/slave-stopped.result:
  log queries
mysql-test/r/status.result:
  log queries
mysql-test/r/symlink.result:
  log queries
mysql-test/r/tablelock.result:
  log queries
mysql-test/r/temp_table.result:
  log queries
mysql-test/r/truncate.result:
  log queries
mysql-test/r/type_blob.result:
  log queries
mysql-test/r/type_date.result:
  log queries
mysql-test/r/type_datetime.result:
  log queries
mysql-test/r/type_decimal.result:
  log queries
mysql-test/r/type_enum.result:
  log queries
mysql-test/r/type_float.result:
  log queries
mysql-test/r/type_ranges.result:
  log queries
mysql-test/r/type_time.result:
  log queries
mysql-test/r/type_timestamp.result:
  log queries
mysql-test/r/type_uint.result:
  log queries
mysql-test/r/type_year.result:
  log queries
mysql-test/r/union.result:
  log queries
mysql-test/r/update.result:
  log queries
mysql-test/r/user_var.result:
  log queries
mysql-test/r/varbinary.result:
  log queries
mysql-test/r/variables.result:
  log queries
mysql-test/t/bench_count_distinct.test:
  log queries
mysql-test/t/check.test:
  log queries
mysql-test/t/count_distinct2.test:
  log queries
mysql-test/t/flush.test:
  log queries
mysql-test/t/isam.test:
  log queries
mysql-test/t/multi_update.test:
  log queries
mysql-test/t/myisam.test:
  log queries
mysql-test/t/order_fill_sortbuf.test:
  log queries
mysql-test/t/rpl000016.test:
  log queries
tools/managertest1.nc:
  test for def_exec overwrite
tools/mysqlmanager.c:
  support def_exec overwrite and queries on running server

include/my_sys.h:
  fixed const value clash that was causing problems in backup_table

include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
client/Makefile.am:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_lex.h:
  Auto merged

added set_exec_stdout and set_exec_stderr to mysqlmanager to be able 
to redirect stdout and stderr
added support for MY_FULL_IO to my_read, so we can tell it to read
a number of bytes in as many chunks as it takes instead of one try


BitKeeper/etc/ignore:
  Added client/mysqlmanager-pwgen to the ignore list
client/Makefile.am:
  mysqlmanager-pwgen
client/mysqlmanagerc.c:
  clean-up
include/my_sys.h:
  added MY_FULL_IO
mysql-test/mysql-test-run.sh:
  started on changes to use mysqlmanager
mysys/my_read.c:
  added support for MY_FULL_IO
tools/managertest1.nc:
  updated test case
tools/mysqlmanager.c:
  added set_exec_stdout and set_exec_stderr

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

client/mysqlmanagerc.c:
  fix to make it compile after merge
sql/lex.h:
  fixes for GRANT ... REQUIRE
sql/sql_lex.h:
  GRANT ... REQUIRE
sql/sql_yacc.yy:
  GRANT ... REQUIRE
tools/mysqlmanager.c:
  fix to make compile after merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Auto merged
include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/md5.c:
  Auto merged
sql/Makefile.am:
  Auto merged

mysys/md5.c:
  Rename: sql/md5.c -> mysys/md5.c
include/md5.h:
  Rename: mysys/md5.h -> include/md5.h
client/Makefile.am:
  added mysqlmanagerc
include/Makefile.am:
  moved md5.h to include
include/mysql.h:
  added mysqlmanager client code
include/mysql_com.h:
  renamed connect2 to my_connect() and made it extern
libmysql/Makefile.shared:
  added md5 to libmysqlclient
libmysql/libmysql.c:
  connect2->my_connect
mysys/Makefile.am:
  added md5 to client
sql/Makefile.am:
  md5 -> mysys
sql/handler.cc:
  fixed typo
tools/managertest1.nc:
  cleanup
tools/mysqlmanager.c:
  fixed bugs
  added md5 authentication
BitKeeper/etc/ignore:
  Added client/mysqlmanagerc to the ignore list
vio/test-ssl:
  no change

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

Fixed that --enable-assembler works on newer Linux system


Makefile.am:
  Another attempt to get pstack into the binary distribution
configure.in:
  Fixed that --enable-assembler works on newer Linux system
  Fixes for pstack
pstack/Makefile.am:
  Another attempt to get pstack into the binary distribution

configure.in:
  Don't enable pstack if mit-pthreads

Fix to get libmysqld examples to be included in distribution


BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Delete: vio/test-ssl
BitKeeper/etc/ignore:
  Added libmysqld/examples/mysql libmysqld/examples/mysqltest to the ignore list
configure.in:
  Fix to get pstack included in distribution
libmysqld/Makefile.am:
  Fix to get libmysqld examples to be included in distribution
libmysqld/examples/Makefile.am:
  Fix to get libmysqld examples to be included in distribution
sql/sql_parse.cc:
  Fixed bug in grant