sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_delete.cc:
  Same as above

mysql-test/t/multi_update.test:
  Made a test feasible. It will last very long time, so I will change 
  it again as soon as Monty pull's it
sql/sql_class.h:
  Some small changes
sql/sql_delete.cc:
  Fixed one bug in my stripping code
sql/sql_parse.cc:
  Additional stuff for UNION's

libmysqld/Makefile.am:
  Added missing files
libmysqld/libmysqld.c:
  cleanup

sql/sql_class.h:
  Auto merged

Optimize fixed length MyISAM rows to use pread/pwrite.


BUILD/compile-pentium-debug-max:
  Also build embedded server
libmysqld/lib_vio.c:
  Add vio_poll_read()
myisam/mi_statrec.c:
  Use pread()/pwrite() instead of seek+read/write
mysql-test/r/multi_update.result:
  Fix multi-table-delete test
mysql-test/t/multi_update.test:
  Fix multi-table-delete test
sql/filesort.cc:
  Fix multi-table-delete
sql/mysql_priv.h:
  Fix multi-table-delete
sql/sql_class.h:
  Fix multi-table-delete
sql/sql_delete.cc:
  Fix multi-table-delete
sql/sql_parse.cc:
  Fix multi-table-delete
sql/sql_select.cc:
  Fix multi-table-delete
sql/sql_table.cc:
  cleanup
sql/sql_unions.cc:
  cleanup
sql/sql_yacc.yy:
  cleanup/ optimize
sql/structs.h:
  Fix multi-table-delete
sql/uniques.cc:
  Fix multi-table-delete

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_class.h:
  Auto merged

in slave binlog - needed for synchronization slave during recovery


sql/log.cc:
  slave log event
sql/log_event.cc:
  slave log event
sql/log_event.h:
  slave log event
sql/slave.cc:
  slave log event
sql/sql_class.h:
  slave log event

sql/sql_class.h:
  Fixed types
sql/sql_delete.cc:
  Fixed typo-bug.

sql/Makefile.am:
  New source file

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.


sql/mysql_priv.h:
  Added new functions needed for UNIONS, EXCEPT's etc
sql/sql_class.h:
  A little change in multi_delete class
sql/sql_lex.h:
  Added command for UNION's
sql/sql_parse.cc:
  One new function and SQLCOM_UNION_SELECT.
  
  Please do not test UNION's. This is just a start of the work on them
sql/sql_yacc.yy:
  Parsing stuff for the UNION's

    missed change


mysql-test/t/check.test:
  missed change

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged

Docs/manual.texi:
  Any server can be installed as a service under NT

    fixed post-commit message
mysql-test/t/check.test
    fixed bug from 3.23 merge


BitKeeper/triggers/post-commit:
  fixed post-commit message
mysql-test/t/check.test:
  fixed bug from 3.23 merge

innobase/include/univ.i:
  Auto merged

configure.in:
  change version number back to avoid confusion
innobase/include/univ.i:
  Fix for gcc 2.96

innobase/include/univ.i:
  Disable XCHG mutex implementation because of compile problem in GCC-2.96

Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Added --skip-stack when using gdb
sql/mysqld.cc:
  Changed reference to bugs@lists.mysql.com to manual reference.

New german error messages


BitKeeper/deleted/.del-ATIS-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~d002b0bc548ff8b3:
  Delete: sql-bench/Results/ATIS-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~e938a858bd12aa8d:
  Delete: sql-bench/Results/RUN-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~14360865bbba479f:
  Delete: sql-bench/Results/alter-table-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~b6be70bb51013cad:
  Delete: sql-bench/Results/big-tables-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~1b715c6fd72e913e:
  Delete: sql-bench/Results/connect-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~f3b1d326092bf44:
  Delete: sql-bench/Results/create-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~a0143553cccb54e2:
  Delete: sql-bench/Results/insert-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~4ffc9cf4be665ea2:
  Delete: sql-bench/Results/select-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~1ed1dc6abd24e7e3:
  Delete: sql-bench/Results/wisconsin-pg-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~2ac8fe298953d43:
  Delete: sql-bench/Results/ATIS-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~cf0d806760eefef2:
  Delete: sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~e625af7f600bf930:
  Delete: sql-bench/Results/ATIS-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~a88e954bc8de5460:
  Delete: sql-bench/Results/RUN-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~d922a0fcc1009130:
  Delete: sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~840503a555e420ec:
  Delete: sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~ee94f987797ca948:
  Delete: sql-bench/Results/alter-table-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~2f516d2c108a9e05:
  Delete: sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~6e532c1936df1737:
  Delete: sql-bench/Results/alter-table-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~28b688e2cd4b6bb3:
  Delete: sql-bench/Results/big-tables-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~6d8209bf72b663ed:
  Delete: sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~c87333d6fe04433e:
  Delete: sql-bench/Results/big-tables-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~1cf5d5f0d70a3fa0:
  Delete: sql-bench/Results/connect-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~7ed15d6fd1a5944c:
  Delete: sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~ab58fffa30dce97e:
  Delete: sql-bench/Results/connect-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~fc207468e871ff69:
  Delete: sql-bench/Results/create-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~241c337935ae1524:
  Delete: sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~4e5a2ab4907748d4:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~975e26cac59161fa:
  Delete: sql-bench/Results/insert-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~27b7a557c3cb07a:
  Delete: sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~a85a6f0477c13f83:
  Delete: sql-bench/Results/insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~34a39fbcb58d8945:
  Delete: sql-bench/Results/select-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~8ef771713f89e1:
  Delete: sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~4f7795c27eaab86b:
  Delete: sql-bench/Results/select-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~8101a5823c17e58a:
  Delete: sql-bench/Results/wisconsin-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~6a468dcd3e6f5405:
  Delete: sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~24a02e007a58bf73:
  Delete: sql-bench/Results/wisconsin-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
Docs/internals.texi:
  Added MySQL protocol
Docs/manual.texi:
  Added links
configure.in:
  Update to 39a
mysql-test/t/check.test:
  Added missing drop table
mysql-test/t/compare.test:
  Added missing drop table
sql/share/german/errmsg.txt:
  Update

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

support-files/mysql.spec.sh:
  Added mysqlcheck

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

Fixes for making distribution


Build-tools/Do-compile:
  Added --no-strip option
Docs/manual.texi:
  Changelog and some fixes to comparison section
client/mysqlshow.c:
  Added --verbose option
mysql-test/r/create.result:
  Test of CREATE ... SELECT with keys
mysql-test/t/create.test:
  Test of CREATE ... SELECT with keys
scripts/make_binary_distribution.sh:
  Changed to use long options
sql-bench/Comments/postgres.benchmark:
  update
sql-bench/server-cfg.sh:
  update to use 'vacuum analyze'

added a test for check table


BitKeeper/triggers/post-commit:
  send a separate commit message to internals
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

added multi-delete test case that does not work - something for Sinisa to fix


client/mysqltest.c:
  fixed bugs to make nested whiles to work

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  Auto merged

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

Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key


Docs/manual.texi:
  Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
  Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
  Fixed wrong compare (not used in MySQL).
  Changed compare to use my_pread()
myisam/mi_packrec.c:
  cleanup
mysql-test/r/alter_table.result:
  Added test for ALTER TABLE
mysql-test/r/variables.result:
  Added test for variables with REAL values.
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE
mysql-test/t/variables.test:
  Added test for variables with REAL values.
mysys/my_pread.c:
  Cleanup
sql-bench/Makefile.am:
  removed extra \
sql-bench/README:
  Fixed typo.
sql/item_func.cc:
  Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
  CREATE ... SELECT now creates keys later
sql/sql_table.cc:
  Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
  Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/ignore:
  Added sql-bench/compare-results-all sql-bench/template.html to the ignore list
Docs/manual.texi:
  Changed innodb_unix_file_flush_method -> innodb_flush_method.

Docs/manual.texi:
  HPUX -> HP-UX where necessary

client/Makefile.am:
  cleanup to make vio compile
client/errmsg.c:
  cleanup
libmysql/Makefile.am:
  vio fix
libmysql/Makefile.shared:
  vio fix
libmysql/errmsg.c:
  fixed up messages

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqltest.c:
  Auto merged

compiles, passes test suite, does magic, has bugs, but none that I know 
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.


BUILD/SETUP.sh:
  make sure client link statically
client/mysqltest.c:
  new commands to test replication probe/parse
include/errmsg.h:
  new error messages
include/mysql.h:
  support for replication auto-magic
libmysql/errmsg.c:
  new error messages
libmysql/libmysql.c:
  replication probe/parse auto-magic
mysql-test/mysql-test-run.sh:
  --client-gdb to run the client in debugger

sql-bench/README:
  msyql -> mysql

Docs/manual.texi:
  cleanup