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

myisam/ft_parser.c:
  cleanup
myisam/ft_update.c:
  bug fixed
mysql-test/mysql-test-run.sh:
  typo fixed

myisam/mi_write.c:
  bug fixed
mysql-test/t/insert_select.test:
  test case added
mysql-test/r/insert_select.result:
  test case added

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


Docs/manual.texi:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged

sql/sql_insert.cc:
  Some tweaking for unions
sql/sql_parse.cc:
  Init of options for unions
sql/sql_unions.cc:
  T

configure.in:
  Fix to compile :(

into x153.internalnet:/home/tonu/mysql-x


BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged

Makefile.am:
  Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
  We need OpenSSL includes here
include/global.h:
  Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
  small fixes
libmysql/Makefile.am:
  We need OpenSSL includes here
libmysql/Makefile.shared:
  Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
  Make it work! (openssl)
libmysql_r/Makefile.am:
  We need OpenSSL includes here
sql/mysqld.cc:
  Memory was not freed before
sql/sql_parse.cc:
  fix
vio/Makefile.am:
  Added testprogram compilation and openssl libraries linking
vio/viossl.c:
  Cleanups, fixes, etc...
vio/viosslfactories.c:
  Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
  Made testprogram work again
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

sql/log_event.h:
  more work on LOAD DATA INFILE

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


sql/sql_parse.cc:
  Auto merged

sql/sql_lex.h:
  Addition for UNION ALL
sql/sql_parse.cc:
  Init for UNION ALL
sql/sql_unions.cc:
  Bug fixes in UNION's
sql/sql_yacc.yy:
  UNION ALL

configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/rpl_sporadic_master.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

#ifdefed out code not used in the server from log events
started on new LOAD DATA INFILE events


include/my_sys.h:
  added pre/post read callbacks to IO_CACHe
mysys/mf_iocache.c:
  pre/post read callbacks
sql/log_event.cc:
  cleanup to #ifdef out unneeded code in the server
  started work on new Load data infile events
sql/log_event.h:
  clean-up plus start of new LOAD DATA INFILE events work
sql/mf_iocache.cc:
  pre/post read callbacks
sql/sql_class.cc:
  file_id
sql/sql_class.h:
  file_id

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

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


Docs/manual.texi:
  Auto merged

innobase/row/row0sel.c:
  Disable a special join speed optimization until Peter Zaitsev's hang is tracked down

innobase/srv/srv0start.c:
  Remove old code

srv0start.c	Support raw disk as a data file
srv0srv.c	Support raw disk as a data file
ha_innobase.cc	Some error messages and support raw disk as a data file


sql/ha_innobase.cc:
  Some error messages and support raw disk as a data file
innobase/srv/srv0srv.c:
  Support raw disk as a data file
innobase/srv/srv0start.c:
  Support raw disk as a data file
innobase/include/srv0srv.h:
  Support raw disk as a data file

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


sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/t/rpl_magic.test:
  Added missing drop table
mysql-test/t/rpl_mystery22.test:
  Added missing drop table
mysql-test/t/rpl_sporadic_master.test:
  Fixed bad merge

myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
configure.in:
  New version

Docs/manual.texi:
  SCCS merged

--low-priority-updates is used and the file has holes.


Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fixed that sleeptime is 0 for new insert delayed threads.

added a test case for it - took some creative work to figure out
how to make it happen at will
updated the manual


Docs/manual.texi:
  fixed wrong info on SLAVE_SKIP_COUNTER
  fixed wrong info in BitKeeper tree build instructions
  updated change history about bug fix
mysql-test/t/rpl_sporadic_master.test:
  tried hard to get slave confused, but failed. nevertheless, a more
  exhaustive test case does not hurt
sql/slave.cc:
  fixed mysterious offset confusion bug

Update to new debian files


configure.in:
  Updated version number
sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha:
  New benchmark results
support-files/debian/README.debian:
  Update to new debian files
support-files/debian/changelog:
  Update to new debian files
support-files/debian/control:
  Update to new debian files
support-files/debian/gomi:
  Update to new debian files
support-files/debian/move:
  Update to new debian files
support-files/debian/patches/ab:
  Update to new debian files
support-files/debian/patches/ad:
  Update to new debian files
support-files/debian/patches/ae:
  Update to new debian files
support-files/debian/rules:
  Update to new debian files
support-files/debian/shlibs:
  Update to new debian files

Docs/manual.texi:
  Changelog

configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  merged
mysql-test/t/rpl_sporadic_master.test:
  merged
sql/Makefile.am:
  merged
sql/slave.h:
  merged

mysql-test/t/bdb.test:
  new test for a bug report

configure.in:
  SCCS merged

configure.in:
  Fix "$target_os" = "freebsd" test; not a critical fix.

Docs/manual.texi:
  Added slave_read_timeout

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

sql/mysqld.cc:
  slave_net_timeout
sql/slave.cc:
  slave_net_timeout
sql/slave.h:
  slave_net_timeout

mysql-test/r/lock.result:
  Fixed wrong result for lock
mysql-test/t/lock.test:
  Added timeouts to make test repeatable

Docs/manual.texi:
  Auto merged

Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts


Docs/manual.texi:
  Added link to copyleft license.
  Updated Changelog
configure.in:
  Fixed typo
mysys/thr_lock.c:
  Removed wrong warning
sql/ha_berkeley.cc:
  Fixed problem with UPDATE
sql/sql_acl.cc:
  Fixed problem with GRANT FILE privilege on database level
sql/sql_parse.cc:
  Fixed that you don't get aborted connection error if you are not using --warning
sql/sql_show.cc:
  Fixed problem with SHOW OPEN TABLES when not using BDB
tests/fork2_test.pl:
  Added test of ALTER TABLE
tests/fork_big.pl:
  Added test of ALTER TABLE