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

ha_innobase.h	Fix a bug in showing of Auto_increment in SHOW TABLE STATUS


sql/ha_innobase.h:
  Fix a bug in showing of Auto_increment in SHOW TABLE STATUS
sql/ha_innobase.cc:
  Fix a bug in showing of Auto_increment in SHOW TABLE STATUS

into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changed GPL license example to make it more clear.
configure.in:
  Fixed typo

mysql-test/r/rpl_sporadic_master.result:
  Made test portable accross table handlers
mysql-test/t/rpl_sporadic_master.test:
  Made test portable accross table handlers

Docs/manual.texi:
  SCCS merged

Added warning for tables where the auto_increment key is 0
Fixed DELETE ... LIMIT 0
Fixed UPDATE ..LIMIT 0


Docs/manual.texi:
  Changelog + Update to CHECK TABLE
configure.in:
  Patch for netBSD
mit-pthreads/gen/ctime.c:
  Patch for netBSD
mit-pthreads/machdep/netbsd-1.1/__signal.h:
  Patch for netBSD
mit-pthreads/stdio/strerror.c:
  Patch for netBSD
myisam/mi_check.c:
  Added warning for tables where the auto_increment key is 0
myisam/myisamchk.c:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/auto_increment.result:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/limit.result:
  Test of DELETE ... LIMIT 0
mysql-test/t/auto_increment.test:
  Added warning for tables where the auto_increment key is 0
mysql-test/t/limit.test:
  Test of DELETE ... LIMIT 0
sql/Makefile.am:
  Don't add mysqld_LDADD to mysqlbinlog (portability patch)
sql/ha_gemini.cc:
  Changed copyright (have got ok from NuSphere previously)
sql/ha_gemini.h:
  Changed copyright (have got ok from NuSphere previously)
sql/sql_delete.cc:
  Fixed DELETE ... LIMIT 0
sql/sql_update.cc:
  Fixed UPDATE ..LIMIT 0

mysql-test/r/lock.result:
  updated result
mysql-test/t/lock.test:
  updated test

not yet fixed


mysql-test/r/lock.result:
  updated result
mysql-test/t/lock.test:
  test case for low prior updates bug

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

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

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

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

Docs/manual.texi:
  Change licensing prices.

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

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.