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

better exit code checking

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

sql/sql_delete.cc:
  Removed some unnecessary stuff

BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_update.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

sql/slave.cc:
  fixed bug in end_slave() - must send kill signal to slave thread

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


sql/sql_class.h:
  Auto merged

fixed race condition in binary log auto-rotation
get rid of extention in binary log to avoid non-rotatable logs


client/mysqltest.c:
  fixed uninitialized use of variable bug
sql/log.cc:
  fixed race condition on binary log auto-rotate
sql/mysqld.cc:
  get rid of extention on binary log
sql/sql_class.h:
  argument to new file (inside_mutex)

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

remove extension from binary log if the user specifies one to avoid
    non-rotatable logs
fixed possible use of unitialized IO_CACHE in debug mode


sql/log.cc:
  fixed race condition in automatic binlog rotation
sql/mysqld.cc:
  remove extension from binary log if the user specifies one to avoid
  non-rotatable logs
sql/slave.cc:
  fixed race condition with slave thread during server shutdown
sql/sql_class.h:
  new_file() needed an argument to know if it was called withing the 
  log mutex or not
sql/sql_repl.cc:
  fixed possible use of unitialized IO_CACHE in debug mode

Docs/manual.texi:
  Removed on more bugger.

manual.texi	Removed a few more spurious occurances of 'Gemini'. The manual is now completely rid of and documentation about GEMINI. GEMINI is not
manual.texi	Open Source software.


Docs/manual.texi:
  Removed a few more spurious occurances of 'Gemini'. The manual is now completely rid of and documentation about GEMINI. GEMINI is not
  Open Source software.

manual.texi	Removed all documentation referring to the GEMINI table type. GEMINI is not released under an Open Source license.


Docs/manual.texi:
  Removed all documentation referring to the GEMINI table type. GEMINI is not released under an Open Source license.

Docs/manual.texi:
  Include latest GPL and LGPL texts from fsf.org
  
  Fix syntax error in email address
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

sql/sql_class.h:
  Made some temporary changes for UNION's. Still waiting for Monty's 
  comments on this.
sql/sql_delete.cc:
  Added a comment as Monty suggested
sql/sql_parse.cc:
  Some speedups for UNIONs
sql/sql_unions.cc:
  First attempts at running UNION's. 
  
  Removed header temporarily because of some bug in my pre-processor.

into tik.mysql.fi:/home/my/mysql-4.0


sql/sql_show.cc:
  Auto merged

mysql-test/r/show_check.result:
  Added back old code
sql/ha_myisam.h:
  Removed warning
sql/mysql_priv.h:
  Added back old code
sql/sql_base.cc:
  Added back old code
sql/sql_parse.cc:
  Added back old code
sql/sql_show.cc:
  Added back old code

    use truncate table
sql/slave.cc
    fixed race condition on server shutdown
sql/sql_repl.cc
    fixed uninitialized use of io_cache


mysql-test/t/rpl_sporadic_master.test:
  use truncate table
sql/slave.cc:
  fixed race condition on server shutdown
sql/sql_repl.cc:
  fixed uninitialized use of io_cache

    fixed test case to produce same results on txn-enabled binary. 
    temporary fix - permanent fix is it make mysqld behave the same with
    MyISAM on auto_increment insert after delete from tbl_name regardless
    of how the binary was compiled
sql/slave.cc
    fixed concurrency bug with log_seq
sql/slave.h
    last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc
    cleared up comment and fixed concurrency bug


mysql-test/t/rpl_sporadic_master.test:
  fixed test case to produce same results on txn-enabled binary. 
  temporary fix - permanent fix is it make mysqld behave the same with
  MyISAM on auto_increment insert after delete from tbl_name regardless
  of how the binary was compiled
sql/slave.cc:
  fixed concurrency bug with log_seq
sql/slave.h:
  last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc:
  cleared up comment and fixed concurrency bug

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

myisam/mi_write.c:
  cleanup
mysys/tree.c:
  cleanup
sql/sql_show.cc:
  bad merge fixed

Docs/manual.texi:
  Auto merged

Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened


Docs/manual.texi:
  Redefinition of myisam_bulk_insert_tree_size
client/insert_test.c:
  Changed to use mysql_real_connect()
include/mysql.h:
  Moved things in mysql_options to optimize these for 64 bit processors
include/mysqld_error.h:
  Removed new error message
myisam/mi_write.c:
  Use myisam_bulk_insert_tree_size per table instead of per index
mysql-test/t/varbinary.test:
  Fixed test case for varbinary
mysys/tree.c:
  Fixed missing if
sql/filesort.cc:
  Threads are again killable in "merge_buffers"
sql/log_event.h:
  cleanup
sql/share/czech/errmsg.txt:
  Removed new error message
sql/share/danish/errmsg.txt:
  Removed new error message
sql/share/dutch/errmsg.txt:
  Removed new error message
sql/share/english/errmsg.txt:
  Removed new error message
sql/share/estonian/errmsg.txt:
  Removed new error message
sql/share/french/errmsg.txt:
  Removed new error message
sql/share/german/errmsg.txt:
  Removed new error message
sql/share/greek/errmsg.txt:
  Removed new error message
sql/share/hungarian/errmsg.txt:
  Removed new error message
sql/share/italian/errmsg.txt:
  Removed new error message
sql/share/japanese/errmsg.txt:
  Removed new error message
sql/share/korean/errmsg.txt:
  Removed new error message
sql/share/norwegian-ny/errmsg.txt:
  Removed new error message
sql/share/norwegian/errmsg.txt:
  Removed new error message
sql/share/polish/errmsg.txt:
  Removed new error message
sql/share/portuguese/errmsg.txt:
  Removed new error message
sql/share/romanian/errmsg.txt:
  Removed new error message
sql/share/russian/errmsg.txt:
  Removed new error message
sql/share/slovak/errmsg.txt:
  Removed new error message
sql/share/spanish/errmsg.txt:
  Removed new error message
sql/share/swedish/errmsg.txt:
  Removed new error message
sql/sql_class.h:
  Cleanup
sql/sql_delete.cc:
  Cleanup
sql/sql_repl.cc:
  Cleanup
sql/sql_show.cc:
  SHOW OPEN TABLES now works when no tables are opened
sql/sql_sort.h:
  Threads are again killable in "merge_buffers"
sql/uniques.cc:
  Threads are again killable in "merge_buffers"

Docs/manual.texi:
  Fixed up licencing costs wording.

Docs/manual.texi:
  Change licensing prices.

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


Docs/manual.texi:
  Auto merged

sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

test SHOW OPEN TABLES


mysql-test/r/show_check.result:
  updated result
mysql-test/t/show_check.test:
  test show open tables
sql/mysql_priv.h:
  post-merge fixes
sql/sql_base.cc:
  post-merge fixes
sql/sql_parse.cc:
  post-merge fixes

sql/slave.h:
  Auto merged
sql/slave.cc:
  Auto merged
Docs/manual.texi:
  merged
sql/sql_base.cc:
  merged
sql/sql_show.cc:
  merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/spanish/errmsg.txt:
  merged and translated the new 4.0 errors - had to type them in 
  anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
  on my translation?

Docs/manual.texi:
  Changelog
sql/slave.cc:
  Added volatile to replication variable
sql/slave.h:
  Added volatile to replication variable
sql/sql_base.cc:
  Cleanup
sql/sql_show.cc:
  Cleanup