mysql-test/t/count_distinct2.test:
  make default NULL in tree->MyISAM test to make sure restore_record()
  does not give a bad surprise
sql/item_sum.cc:
  cleanup according to Monty's suggestions
sql/item_sum.h:
  cleanup according to Monty's suggestions

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

include/mysqld_error.h:
  new errors
mysql-test/r/rpl000009.result:
  test load data from master
mysql-test/t/rpl000009.test:
  test load data from master
sql/mini_client.cc:
  extra functionality needed for load data from master and other things
sql/mini_client.h:
  addition to API
sql/mysql_priv.h:
  mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
  more error messages
sql/slave.cc:
  cleanup of fetch_nx_table()
sql/slave.h:
  cleanup of fetch_nx_table()
sql/sql_base.cc:
  remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
  remove unused replication variables
sql/sql_class.h:
  remove unused replication variabled
sql/sql_db.cc:
  make mysql_create_db()/mysql_rm_db() work with thd == 0 
  (do not write messages to the net) and instead return success/error
sql/sql_lex.h:
  added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
  LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
  LOAD DATA FROM MASTER
sql/sql_repl.h:
  LOAD DATA FROM MASTER
sql/sql_yacc.yy:
  LOAD DATA FROM MASTER

BitKeeper/triggers/post-commit:
  Updated commit address.

sql/item_sum.cc:
  do not insert into deleted tree in count(distinct)

test heap table/tree overflow in count(distinct)


mysql-test/r/count_distinct2.result:
  added test for tree/heap table overflow
mysql-test/t/count_distinct2.test:
  test tree/heap table overflow
sql/item_sum.cc:
  handle tree overflow in count(distinct)
sql/item_sum.h:
  t

from libmysql directory to make things compile


libmysql/Makefile.am:
  symlink sql/violite.c to libmysql/violite.c
libmysql/Makefile.shared:
  fixes for violite.c

BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged

BitKeeper/etc/logging_ok:
  auto-union
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged

mysys/ptr_cmp.c:
  Removed old comments
pstack/bucomm.c:
  Change to use mkstemp.
sql/Makefile.am:
  Added Unique class
sql/filesort.cc:
  Changes to let the Unique class use the old filesort code.
sql/sql_class.h:
  Added Unique class
sql/sql_handler.cc:
  Removed warning.
sql/sql_select.cc:
  Cleaned up typo.

os0file.c	InnoDB now allows parameter innodb_unix_file_flush_method
srv0start.c	InnoDB now allows parameter innodb_unix_file_flush_method


innobase/srv/srv0start.c:
  InnoDB now allows parameter innodb_unix_file_flush_method
innobase/os/os0file.c:
  InnoDB now allows parameter innodb_unix_file_flush_method
innobase/log/log0log.c:
  InnoDB now allows parameter innodb_unix_file_flush_method

into donna.mysql.fi:/home/heikki/mysqle


BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Add links for downloadable menagerie db distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

srv0srv.c	One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h	One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc	One can now specify innodb_unix_file_flush_method in my.cnf


sql/ha_innobase.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Don't read MyISAM header when running without locking


include/myisam.h:
  Don't read header when running without locking.
myisam/mi_locking.c:
  Don't update changed flag for temporary files.
myisam/mi_open.c:
  Don't read header when running without locking.
myisam/mi_static.c:
  Don't read header when running without locking.
sql/item_sum.cc:
  Don't write rows in MyISAM tables when using count(distinct)
sql/mysqld.cc:
  Don't read MyISAM header when running without locking.
  Remove -Sg option.
sql/sql_analyse.h:
  Remove duplicate header.
sql/sql_select.cc:
  Cleaned up prototypes.
  Don't write rows to count(DISTINCT) MyISAM tables.
sql/sql_select.h:
  Cleaned up prototypes.
sql/table.h:
  A
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixed problem with fuzzy dates.


mysql-test/r/func_time.result:
  Added test of fuzzy dates
mysql-test/t/func_time.test:
  Added test of fuzzy dates
sql/item.cc:
  Fixed bug with fuzzy dates
sql/sql_parse.cc:
  Remove wrong access check for locks.
  (This has to be delayed for 4.0 because there is currently now way
  to check for "any of the following privileges"
Docs/manual.texi:
  Changelog

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

into janikt.pp.saunalahti.fi:/home/my/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged

Small cleanups


Docs/manual.texi:
  Updated how to add new native functions
mysql-test/r/func_crypt.result:
  Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
  Fix for crypt on FreeBSD
mysys/thr_lock.c:
  Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added a link to a GUI.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into threads.polyesthetic.msg:/usr/local/src/my/4

into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into threads.polyesthetic.msg:/usr/local/src/my/4


BitKeeper/etc/logging_ok:
  auto-union

into threads.polyesthetic.msg:/usr/local/src/my/3

sql/sql_parse.cc:
  Check table access for SQLCOM_LOCK_TABLES.

Docs/manual.texi:
  typo fixes, miscellaneous general cleanup

Docs/manual.texi:
  general typo fixes

Docs/manual.texi:
  typo fix; fix odd repetition in toc header.

manual.texi	Mods to Windows-specific sections, chapter 4.


Docs/manual.texi:
  "windows" -> "Windows", where appropriate.
  Mods to Windows-specific sections, chapter 4.

manual.texi	I promise to always run test-make-manual.
manual.texi	I promise to always run test-make-manual.
manual.texi	...


Docs/manual.texi:
  I promise to always run test-make-manual.
  I promise to always run test-make-manual.
  I promise to always run test-make-manual.
  ...

Docs/manual.texi:
  Added consultant.

Docs/manual.texi:
  Updated manual about auto-increment in InnoDB

dict0mem.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
univ.i  	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0dict.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0mem.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
ha_innobase.cc	InnoDB now tries to provide autoinc column value from a counter table in data dict


sql/ha_innobase.cc:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/sync/sync0sync.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0mem.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0dict.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0dict.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0mem.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/sync0sync.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/univ.i:
  InnoDB now tries to provide autoinc column value from a counter table in data dict

srv0start.c	Tablespace size must be at least 10 MB


innobase/srv/srv0start.c:
  Tablespace size must be at least 10 MB
Docs/manual.texi:
  Added that InnoDB tablespace must be at least 10 MB, removed single quotes from phantom

Docs/manual.texi:
  Added entry in contrib software.