libmysqld/Makefile.am:
  sql_unions -> sql_union
BitKeeper/etc/ignore:
  Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
  fix to get path-independent logging
mysql-test/r/rpl_log.result:
  fix for path-independent logging
sql/log.cc:
  fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
  fixed compile error with USING_TRANSACTIONS

mysql-test/t/union.test:
  fixed error message numbers

mysql-test/r/rpl_log.result:
  fixed result for new file_id generating method
BitKeeper/etc/ignore:
  Added vio/viotest-ssl to the ignore list
sql/log.cc:
  use a different method to generate unique file_id
sql/log_event.cc:
  new file_id generationg method
sql/sql_class.h:
  new file_id generationg method

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


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged

Stop event and bugs the test suite could not catch
Did some big restructuring of binlog event classes - most important
change is that now each event class has exec_event method and one does
not need to modify slave core code to add a new event. Slave code is
now much smaller and easier to read



include/my_sys.h:
  pre_code and arg in IO_CACHE
mysql-test/r/rpl_log.result:
  updated result for LOAD DATA INFILE fix
mysys/mf_iocache.c:
  pre_close routine and arg pointer for callback magic
sql/log.cc:
  changed MYSQL_LOG so that write() method is for generic
  Log_event - removed redundant code
sql/log_event.cc:
  added classes for file events
  added exec_event() method to all classes
  restructured/cleaned up event classes
sql/log_event.h:
  added classes for file events
  added exec_event() method to all classes
  restructured/cleaned up event classes
sql/mf_iocache.cc:
  pre_close/arg
sql/mysqld.cc:
  added slave-load-tmpdir and old-rpl-compat options
sql/slave.cc:
  changed exec_event() to use Log_event::exec_event()
  some routines are now needed in log_event.cc and cannot be static/inline
  general cleanup
sql/slave.h:
  some routines are now extern because they are called from log_event.cc
sql/sql_class.cc:
  added slave_net
sql/sql_class.h:
  added slave_net to THD
  MYSQL_LOG::write now handles generic Log_event
sql/sql_load.cc:
  changes for new handling of LOAD DATA INFILE replication
sql/sql_repl.cc:
  added log_loaded_block() callback for IO_CACHE
sql/sql_repl.h:
  added structure to pass args to IO_CACHE callback from mysql_load

New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION


Docs/manual.texi:
  Changelog
include/mysqld_error.h:
  Add new error messages needed for UNION
mysql-test/r/union.result:
  New tests for UNION
mysql-test/t/analyse.test:
  Add missing drop table
mysql-test/t/union.test:
  new tests for UNION
sql/Makefile.am:
  Change name of sql_unions.cc to sql_union.cc
sql/item.cc:
  Use List_iterator_fast
sql/item_cmpfunc.cc:
  Use List_iterator_fast
sql/item_func.cc:
  Use List_iterator_fast
sql/item_sum.cc:
  Use List_iterator_fast
  Optimize count(distinct)
  Cleanup of indentation and comments
sql/item_sum.h:
  Optimize count(distinct)
sql/key.cc:
  Use List_iterator_fast
sql/mysql_priv.h:
  Add new option bits
sql/opt_sum.cc:
  Use List_iterator_fast
sql/share/Makefile.am:
  Add 'fix_errors' label
sql/share/czech/errmsg.txt:
  Add new error messages needed for UNION
sql/share/danish/errmsg.txt:
  Add new error messages needed for UNION
sql/share/dutch/errmsg.txt:
  Add new error messages needed for UNION
sql/share/english/errmsg.txt:
  Add new error messages needed for UNION
sql/share/estonian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/french/errmsg.txt:
  Add new error messages needed for UNION
sql/share/german/errmsg.txt:
  Add new error messages needed for UNION
sql/share/greek/errmsg.txt:
  Add new error messages needed for UNION
sql/share/hungarian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/italian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/japanese/errmsg.txt:
  Add new error messages needed for UNION
sql/share/korean/errmsg.txt:
  Add new error messages needed for UNION
sql/share/norwegian-ny/errmsg.txt:
  Add new error messages needed for UNION
sql/share/norwegian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/polish/errmsg.txt:
  Add new error messages needed for UNION
sql/share/portuguese/errmsg.txt:
  Add new error messages needed for UNION
sql/share/romanian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/russian/errmsg.txt:
  Add new error messages needed for UNION
sql/share/slovak/errmsg.txt:
  Add new error messages needed for UNION
sql/share/spanish/errmsg.txt:
  Add new error messages needed for UNION
sql/share/swedish/errmsg.txt:
  Add new error messages needed for UNION
sql/sql_analyse.cc:
  Use List_iterator_fast
sql/sql_base.cc:
  Use List_iterator_fast
  Add new argument to setup_fields
sql/sql_class.cc:
  Use List_iterator_fast
sql/sql_class.h:
  Create new class for UNION
sql/sql_handler.cc:
  Use List_iterator_fast
sql/sql_insert.cc:
  Use List_iterator_fast
sql/sql_lex.h:
  Cleanup
sql/sql_list.cc:
  Faster iteration of lists
sql/sql_list.h:
  Faster iterations of lists
sql/sql_load.cc:
  Use List_iterator_fast
sql/sql_parse.cc:
  Fix UNION code
sql/sql_select.cc:
  Use List_iterator_fast
  Make create_tmp_table more general to be usable by UNION
sql/sql_select.h:
  Changes to speed up copy_fields()
sql/sql_show.cc:
  Use List_iterator_fast
sql/sql_table.cc:
  Use List_iterator_fast
sql/sql_union.cc:
  Fix UNION code
sql/sql_update.cc:
  Use List_iterator_fast
sql/sql_yacc.yy:
  Fix UNION code

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