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 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

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"

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

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Added new example
  Updated 4.0 changelog

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

include/mysqld_error.h:
  new error message
mysql-test/r/rpl_log.result:
  updated results
mysql-test/t/rpl_log.test:
  test show new master for slave
sql/lex.h:
  show new master for slave
sql/share/czech/errmsg.txt:
  new error
sql/share/danish/errmsg.txt:
  new error
sql/share/dutch/errmsg.txt:
  new error
sql/share/english/errmsg.txt:
  new error
sql/share/estonian/errmsg.txt:
  new error
sql/share/french/errmsg.txt:
  new error
sql/share/german/errmsg.txt:
  new error
sql/share/greek/errmsg.txt:
  new error
sql/share/hungarian/errmsg.txt:
  new error
sql/share/italian/errmsg.txt:
  new error
sql/share/japanese/errmsg.txt:
  new error
sql/share/korean/errmsg.txt:
  new error
sql/share/norwegian-ny/errmsg.txt:
  new error
sql/share/norwegian/errmsg.txt:
  new error
sql/share/polish/errmsg.txt:
  new error
sql/share/portuguese/errmsg.txt:
  new error
sql/share/romanian/errmsg.txt:
  new error
sql/share/russian/errmsg.txt:
  new error
sql/share/slovak/errmsg.txt:
  new error
sql/share/spanish/errmsg.txt:
  new error
sql/share/swedish/errmsg.txt:
  new error
sql/sql_lex.h:
  show new master for slave
sql/sql_parse.cc:
  show new master for slave
sql/sql_repl.cc:
  show new master for slave
sql/sql_repl.h:
  show new master for slave
sql/sql_yacc.yy:
  show new master for slave

mysys/tree.c:
  typo fixed

Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format


Docs/manual.texi:
  Update Changelog
client/mysqldump.c:
  Fixed dump to use -- instead of # as comment characters.
libmysql/libmysql.c:
  Removed support for the 3.20 protocol format
myisam/myisamchk.c:
  Fixed typo in printf
mysql-test/r/varbinary.result:
  Test of new hex constant format
mysql-test/t/varbinary.test:
  Test of new hex constant format
sql/sql_lex.cc:
  Added support for ANSI SQL X'hex-string' format.
sql/sql_lex.h:
  Added support for ANSI SQL X'hex-string' format.
sql/sql_yacc.yy:
  Added support for ANSI SQL X'hex-string' format.

BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
  Added myisam/test1.MYD myisam/test1.MYI to the ignore list

Docs/manual.texi:
  Corrected installation example.

Docs/manual.texi:
  Fixed bug for displaying in PDF, added mirror in France.

include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysys/tree.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

bulk inserts optimization: caching keys in binary tree


include/my_base.h:
  bulk inserts optimization: caching keys in binary tree
include/my_tree.h:
  memory-limited tree
include/myisam.h:
  bulk inserts optimization: caching keys in binary tree
isam/isamlog.c:
  memory-limited tree
isam/pack_isam.c:
  memory-limited tree
myisam/ft_boolean_search.c:
  memory-limited tree
myisam/ft_nlq_search.c:
  memory-limited tree
myisam/ft_parser.c:
  memory-limited tree
myisam/ft_stopwords.c:
  memory-limited tree
myisam/mi_extra.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_open.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_static.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_write.c:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamdef.h:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamlog.c:
  memory-limited tree
myisam/myisampack.c:
  memory-limited tree
mysql-test/mysql-test-run.sh:
  memory-limited tree
mysql-test/t/alter_table.test:
  make it faster
mysys/tree.c:
  memory-limited tree
sql/ha_myisam.cc:
  bulk inserts optimization: caching keys in binary tree
sql/item_sum.cc:
  memory-limited tree
sql/mysqld.cc:
  bulk inserts optimization: caching keys in binary tree
sql/sql_analyse.h:
  memory-limited tree
sql/uniques.cc:
  memory-limited tree

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


BitKeeper/etc/ignore:
  auto-union
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/t/multi_update.test:
  Making a test change the order of the tables, so that initalize_tables 
  would be tested properly
mysys/my_compress.c:
  Just changed my e-mail address .... ;o)
sql/filesort.cc:
  Making sure that merge_buffers can not be killed
sql/sql_class.h:
  Added initialize_tables
sql/sql_delete.cc:
  Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
  same as above
BitKeeper/etc/ignore:
  Added locked to the ignore list

mysql-test/r/rpl_log.result:
  missed version again - next time will use searh and replace

    fixed left over hard coded version instances in the result 



mysql-test/r/rpl_log.result:
  fixed left over hard coded version instances in the result

fixes for rpl_log test to make it config-independent


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
  support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
  import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
  if we got wrong result on eval_result test case, diff against the
  expanded result, not the template
mysql-test/r/rpl_log.result:
  change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
  get server version from the server
  remove obsoleted replace hack to solve port problem - use eval_result
  instead