mysys/tree.c:
  typo fixed

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

fixed bug in LOAD DATA FROM MASTER


BitKeeper/etc/ignore:
  Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
  post-merge fix

mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged

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


mysql-test/r/type_float.result:
  Auto merged

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

mysql-test/r/type_float.result:
  fixed test result

mysql-test/r/type_float.result:
  Updated test result

Docs/manual.texi:
  Update with changes from old version of the 4.0 manual.
mysql-test/r/order_by.result:
  New tests for ORDER BY ... DESC
mysql-test/t/order_by.test:
  New tests for ORDER BY ... DESC
sql/sql_delete.cc:
  Removed DEBUG code

BitKeeper/triggers/post-incoming:
  Change mode to -rwxrwxr-x

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

added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events

sql/ha_innobase.cc:
  Update possible row timestamp column also in an update

BitKeeper/etc/logging_ok:
  auto-union
myisam/myisamchk.c:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged

Docs/manual.texi:
  Auto merged

myisam/myisamchk.c:
  --force now implices --update
sql/share/italian/errmsg.txt:
  Update of error messages

Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables


man/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
  Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
  Changed safe_mysqld -> mysqld_safe
man/perror.1:
  Changed safe_mysqld -> mysqld_safe
man/replace.1:
  Changed safe_mysqld -> mysqld_safe
man/which.2:
  Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
  Fixed bug when using packed keys.
scripts/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
  Changed safe_mysqld -> mysqld_safe
sql/lex.h:
  Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
  Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
  Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
  Some changes to SHOW commands.
support-files/binary-configure.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
  Changed safe_mysqld -> mysqld_safe

mysql-test/mysql-test-run.sh:
  Auto merged

order directly from the index instead of using a filesort.


mysql-test/mysql-test-run.sh:
  [ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
  Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
  Added test for ORDER BY DESC optimization
sql/opt_range.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  add LIKE example illustrating case sensitivity.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

updated rotate event to set new position along with the new log


mysql-test/mysql-test-run.sh:
  added --do-test
mysql-test/r/rpl_log.result:
  update for new rotate event format
sql/log_event.cc:
  rotate event now supports forcing a new position, not just the log
sql/log_event.h:
  clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
  accept position setting from rotate event
sql/sql_repl.cc:
  updates to fake_rotate_event() for the new format

Fixed bug in handling of packed MyISAM keys


myisam/mi_create.c:
  Fixed length rows should not use row checksum
myisam/mi_search.c:
  Fixed bug in handling packed keys.
myisam/mi_statrec.c:
  Fixed bug when using --checksum on fixed length rows

Changed mysql-test to use --language
Cleaned up parameters to filesort()


configure.in:
  Fixed typo
mysql-test/install_test_db.sh:
  Changed test case to use --language
mysql-test/mysql-test-run.sh:
  Changed test case to use --language
  Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
  Fixed test case to make it repeatable
mysql-test/t/insert.test:
  Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
  Cleaned up test
mysql-test/t/select_found.test:
  Fixed test case to make it repeatable
sql/filesort.cc:
  Fixed bug when sorting big files (introduced with multi-table-delete)
  cleaned up parameters.
sql/mysql_priv.h:
  Cleaned up parameters to filesort()
sql/mysqld.cc:
  Fixed typo on enum
sql/sql_delete.cc:
  Cleanup
sql/sql_select.cc:
  Cleanup
sql/sql_table.cc:
  Cleanup
sql/sql_test.cc:
  Cleanup
sql/sql_update.cc:
  Cleanup

mysql-test/mysql-test-run.sh:
  Auto merged

client/mysqltest.c:
  Added --big-test argument
libmysqld/lib_sql.cc:
  Reset error messages before new query.
libmysqld/lib_vio.c:
  Fixed reading of results.
mysql-test/mysql-test-run.sh:
  Added option --big
mysql-test/r/multi_update.result:
  More multi-delete tests
mysql-test/t/bdb-crash.test:
  Added missing test if BDB is supported
mysql-test/t/multi_update.test:
  More multi-delete tests

sql/mysqld.cc:
  Put OPT_INNODB_UNIX_FILE_FLUSH_METHOD to mysqld.cc enum type

sync0sync.ic	Do not use GCC in-line assembly
srv0start.h	Eliminate a deadlock of threads at startup
buf0buf.h	Add some debug functions
srv0start.c	Remove a printf


innobase/srv/srv0start.c:
  Remove a printf
innobase/include/buf0buf.h:
  Add some debug functions
innobase/include/srv0start.h:
  Eliminate a deadlock of threads at startup
innobase/include/sync0sync.ic:
  Do not use GCC in-line assembly
innobase/include/univ.i:
  Added a new debug define option