Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries

into mysql.sashanet.com:/reiser-data/mysql-4.0

got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.


client/mysqltest.c:
  added require_version
mysql-test/mysql-test-run.sh:
  added --master-binary=,--slave-binary=,--old-master options
  sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication from 3.23 master

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

sql/mysql_priv.h:
  Auto merged

Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge


mysql-test/r/rpl000001.result:
  fixed bug in result
sql/log_event.cc:
  fixes for slave backward compat
sql/log_event.h:
  fixes for slave backward compat
sql/mysql_priv.h:
  fixes for slave backward compat
sql/net_serv.cc:
  fixes for slave backward compat
sql/repl_failsafe.cc:
  fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
  fixes for slave backward compat
sql/slave.h:
  fixes for slave backward compat
sql/sql_load.cc:
  fixes for slave backward compat

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

include/my_getopt.h:
  Removed a member from my_getopt struct.
myisam/myisamchk.c:
  pdated myisamchk. More features in use from my_getopt
mysys/my_getopt.c:
  Fixed a bug in handle_options(). Short options were not tested
  whether existed when given from the command line. Fixed a bug
  in getopt_ll, got division by zero in some cases. Added new functions
  my_print_help() and my_print_variables() to be used by mysql server
  and most clients.

sql/opt_sum.cc:
  Auto merged

BitKeeper/deleted/.del-README~877d76bcd19f7193:
  Delete: mysql-test/xml/README
BitKeeper/deleted/.del-sel000001.xml~f0eb64c0346366db:
  Delete: mysql-test/xml/tests/sel000001.xml
BitKeeper/deleted/.del-sel000002.xml~8cd06da5293a7147:
  Delete: mysql-test/xml/tests/sel000002.xml
BitKeeper/deleted/.del-sel000003.xml~1a622b8d30d7ade8:
  Delete: mysql-test/xml/tests/sel000003.xml
BitKeeper/deleted/.del-sel000004.xml~515488ef221523d9:
  Delete: mysql-test/xml/tests/sel000004.xml
BitKeeper/deleted/.del-sel000005.xml~a6344e46ba572dc3:
  Delete: mysql-test/xml/tests/sel000005.xml
BitKeeper/deleted/.del-sel000006.xml~8ad8f44f49b21246:
  Delete: mysql-test/xml/tests/sel000006.xml
BitKeeper/deleted/.del-sel000007.xml~bfcb6d85276be7e8:
  Delete: mysql-test/xml/tests/sel000007.xml
BitKeeper/deleted/.del-sel000008.xml~1d6082f0905c51b6:
  Delete: mysql-test/xml/tests/sel000008.xml
BitKeeper/deleted/.del-sel000009.xml~8677613dc624cb0c:
  Delete: mysql-test/xml/tests/sel000009.xml
BitKeeper/deleted/.del-sel000010.xml~9b98c9cce8fac145:
  Delete: mysql-test/xml/tests/sel000010.xml
BitKeeper/deleted/.del-sel000011.xml~432156d127cbd22f:
  Delete: mysql-test/xml/tests/sel000011.xml
BitKeeper/deleted/.del-sel000012.xml~a410d08dc4cfee11:
  Delete: mysql-test/xml/tests/sel000012.xml
BitKeeper/deleted/.del-sel000013.xml~2717cbfbe5730174:
  Delete: mysql-test/xml/tests/sel000013.xml
BitKeeper/deleted/.del-sel000014.xml~bcf55df6a036bd8f:
  Delete: mysql-test/xml/tests/sel000014.xml
BitKeeper/deleted/.del-sel000015.xml~b72689a8f9b21372:
  Delete: mysql-test/xml/tests/sel000015.xml
BitKeeper/deleted/.del-sel000016.xml~32f1ef2e3d214be0:
  Delete: mysql-test/xml/tests/sel000016.xml
BitKeeper/deleted/.del-sel000017.xml~81423597605ff77f:
  Delete: mysql-test/xml/tests/sel000017.xml
BitKeeper/deleted/.del-sel000018.xml~82e2e7bde83f56d8:
  Delete: mysql-test/xml/tests/sel000018.xml
BitKeeper/deleted/.del-sel000019.xml~c0f0b05e481b90e7:
  Delete: mysql-test/xml/tests/sel000019.xml
BitKeeper/deleted/.del-sel000020.xml~8849bbf91a4fd5ec:
  Delete: mysql-test/xml/tests/sel000020.xml
BitKeeper/deleted/.del-sel000021.xml~2763b87c1549ba87:
  Delete: mysql-test/xml/tests/sel000021.xml
BitKeeper/deleted/.del-sel000022.xml~da2083ef423ae39a:
  Delete: mysql-test/xml/tests/sel000022.xml
BitKeeper/deleted/.del-sel000023.xml~11993b379b9838be:
  Delete: mysql-test/xml/tests/sel000023.xml
BitKeeper/deleted/.del-sel000024.xml~dd067aa28220fa4c:
  Delete: mysql-test/xml/tests/sel000024.xml
BitKeeper/deleted/.del-sel000025.xml~3e766aa1e43b303:
  Delete: mysql-test/xml/tests/sel000025.xml
BitKeeper/deleted/.del-sel000026.xml~15145e496417646f:
  Delete: mysql-test/xml/tests/sel000026.xml
BitKeeper/deleted/.del-README~cd4bb681e5a0cd10:
  Delete: mysql-test/xml/xsl/README
BitKeeper/deleted/.del-sel000027.xml~95e7de3e9934b570:
  Delete: mysql-test/xml/tests/sel000027.xml
BitKeeper/deleted/.del-sel000028.xml~c72bfec6600949b:
  Delete: mysql-test/xml/tests/sel000028.xml
BitKeeper/deleted/.del-sel000029.xml~3aba1eb23ef86c9e:
  Delete: mysql-test/xml/tests/sel000029.xml
BitKeeper/deleted/.del-sel000030.xml~c2b25781eefaee9:
  Delete: mysql-test/xml/tests/sel000030.xml
BitKeeper/deleted/.del-mysqltest.xsl~1b8f6ec4f1b5f634:
  Delete: mysql-test/xml/xsl/mysqltest.xsl
sql/opt_sum.cc:
  Fixed typo

  Updated general manual about InnoDB locking and CHECK TABLE


Docs/manual.texi:
  Updated general manual about InnoDB locking and CHECK TABLE

Added url to success story form in manual.


Docs/Support/docbook-fixup.pl:
  A few required additions to script.
Docs/manual.texi:
  Added url to success story form.

Docs/manual.texi:
  fix bad edit

Docs/manual.texi:
  typos pointed out by mailing list reader

Docs/manual.texi:
  fix too short/too long ellipses

I did not know I can't do chmod ...
So, it killed some of my changes. 
But I am smarter, and as I have first saved my work, before BK ruined
it, so here it comes ...


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000001.eval to the ignore list

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

fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select 
is better than the code that does not compile.


mysql-test/r/rpl000001.result:
  updated result
mysys/mf_iocache2.c:
  fixed wrong DBUG_ASSERT()
sql/opt_sum.cc:
  fixed an apparent typo to make it compile

into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged

include/my_global.h:
  added dbug_volatile
mysys/mf_iocache2.c:
  some debugging code to investigate failed assert in my_b_append_tell()
sql/item_func.cc:
  fixed logging bug in DO RELEASE_LOCK()

Docs/manual.texi:
  minor cleanups

Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN


Docs/manual.texi:
  ChangeLog
include/my_getopt.h:
  Removed compiler warnings
myisam/myisamchk.c:
  Fixes for new getopt
mysql-test/r/explain.result:
  Updated test results
mysql-test/r/innodb.result:
  Updated test results
mysql-test/r/join.result:
  Updated test results
mysql-test/t/innodb.test:
  Updated test results
mysys/default.c:
  Bug fix when using --no-defaults
mysys/my_getopt.c:
  Fixes for new getopt
sql/ha_innodb.cc:
  Sets ref_length to right value (faster rnd_pos() handling).
  Fixed problem with multi-table-delete.
  Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
  Remove not used index from EXPLAIN
sql/sql_cache.cc:
  Fixed core dump bug when not using query cache
sql/sql_select.cc:
  Remove not used index from EXPLAIN

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/hash.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged

Docs/manual.texi:
  changelog
sql/sql_acl.cc:
  Fix REFERENCE -> REFERENCES

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  More information about UNSIGNED BIGINT arithmetic
sql/slave.cc:
  Make binary logs 4G safe
sql/slave.h:
  Make binary logs 4G safe
sql/sql_rename.cc:
  cleanup

  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk


sql/ha_innobase.cc:
  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk