Docs/manual.texi:
  Update

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

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

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

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


Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/rpl000017-slave.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/slave.cc:
  Auto merged

Configure fixes


configure.in:
  Fix for pstack
libmysqld/Makefile.am:
  Fix to create examples
mysql-test/t/drop.test:
  Fix error messages
mysql-test/t/isolation.test:
  Fix error messages
mysql-test/t/union.test:
  Fix error messages

Fixed some wrong test cases


Docs/manual.texi:
  Changelog
extra/perror.c:
  Added BDB table errors
include/myisam.h:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
  Better logging
mysql-test/r/join.result:
  Fixed missing results
mysql-test/r/rpl000006.result:
  Updated result
mysql-test/t/join.test:
  Fixed wrong test
mysql-test/t/rpl000001.test:
  Fixed wrong test
mysql-test/t/rpl000006.test:
  Cleanup
mysql-test/t/rpl000017-slave.sh:
  Fixed too long password
mysql-test/t/rpl000017.test:
  Fixed too long password
sql/ha_myisam.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
  Unique error for DEADLOCK
sql/slave.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum

sql/mysqld.cc:
  cannot use unireg_abort before unireg_init

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


myisam/mi_write.c:
  Auto merged

Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql.h:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged

Include missing man pages into binary distribution


BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
  Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
  Changelog
extra/perror.c:
  Added missing error codes
include/my_base.h:
  Added unique error for DEADLOCK
include/mysql.h:
  Portability fix for the LCC windows compiler
include/mysqld_error.h:
  Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
  Include missing man pages into binary distribution
sql/ha_berkeley.cc:
  Added unique error for DEADLOCK
sql/ha_berkeley.h:
  Added unique error for DEADLOCK
sql/handler.h:
  Added unique error for DEADLOCK
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
  Added unique error for DEADLOCK

myisam/mi_extra.c:
  More debugging information
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug
sql/sql_base.cc:
  Clear field->query_id when using UNION
sql/sql_parse.cc:
  Fix for UNION bug
sql/sql_union.cc:
  Cleanup
sql/table.h:
  Fix for UNION bug
tools/Makefile.am:
  Fix for compiling with MIT-threads

buf0buf.c	Fix uninitilaized flush field noticed with Purify


innobase/buf/buf0buf.c:
  Fix uninitilaized flush field noticed with Purify
innobase/log/log0log.c:
  Eliminate a Purify warning

Fixed array overrun when using drop_db
Portability fixes


BitKeeper/etc/ignore:
  Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list
acinclude.m4:
  Fixed reference to top_builddir
myisam/mi_write.c:
  Fixed locking problem when using bulk insert
sql/sql_db.cc:
  Fixed array overrun when using drop_db

client/mysql.cc:
  Increased version number
client/mysqltest.c:
  Changed to use default path
include/mysql.h:
  Changed prototype of mysql_server_init
libmysql/libmysql.c:
  Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
  Changed prototype of mysql_server_init
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug

tools/Makefile.am:
  Fixed typo

  Change a mirror contact e-mail


Docs/manual.texi:
  Change a mirror contact e-mail

BitKeeper/etc/ignore:
  auto-union
configure.in:
  SCCS merged
client/mysql.cc:
  SCCS merged
client/mysqltest.c:
  SCCS merged
mysql-test/mysql-test-run.sh:
  Auto merged
libmysqld/libmysqld.c:
  SCCS merged

mysql test suite.

A few minor libmysqld fixes.

Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they
can be linked against libmysqlclient or libmysqld.


sql/mysqld.cc:
  have unireg_end() exit(), instead of pthread_exit()
  if inside the EMBEDDED_LIBRARY.  This is a hack
  which hopefully won't be needed.  But without it,
  the program hangs at end.
client/mysql.cc:
  Don't call mysql_ssl_clear() unless HAVE_OPENSSL.
client/mysqltest.c:
  Add mysql_server_init() and _end().
acinclude.m4:
  change .. to $(top_builddir) in innodb_libs
Makefile.am:
  Add libmysqld/examples to link_sources target
configure.in:
  output libmysqld/examples/Makefile
  Also, change .. to $(top_builddir) in readline_link
BitKeeper/etc/ignore:
  added linked_libmysqldex_sources
mysql-test/mysql-test-run.sh:
  use latin1, not latin1_de, in tests
libmysqld/libmysqld.c:
  Add replication functions.

client/Makefile.am:
  Cleanup
sql/Makefile.am:
  Cleanup
sql/share/dutch/errmsg.txt:
  Added missing error messages
sql/share/ukrainian/errmsg.txt:
  Added missing error messages
sql/sql_handler.cc:
  Portability fix
tools/Makefile.am:
  Portability fix

  Added a mirror in Finland


Docs/manual.texi:
  Added a mirror in Finland

  Added a mirror in Turkey
turkey.eps, turkey.gif, turkey.txt:
  new file


Docs/manual.texi:
  Added a mirror in Turkey

updated mysql-test-run with features from 4.0
added a test case for broken load data from master for MyISAM tables
with checksum


client/mysqltest.c:
  fixed parser bug
mysql-test/mysql-test-run.sh:
  backported changes from 4.0 ( needed to be able to run client in gdb)
mysql-test/t/rpl000006.test:
  updated test case for a bug