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

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

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

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