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

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

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.

Docs/manual.texi:
  minor change notes mods

.del-violite.c~d7b85be615595ace	Delete: sql/violite.c


BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Delete: sql/violite.c
BitKeeper/deleted/.del-violite.c~afa871b4aab14371:
  Delete: client/violite.c

configure.in:
  openssl support

configure.in:
  openssl support

acinclude.m4:
  openssl support

into x3.internalnet:/home/tonu/bk/mysql-4.0-modified


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

sql/mysqld.cc:
  openssl support

missing:
  openssl support
sql/Makefile.am:
  openssl support
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

acconfig.h	openssl support
acinclude.m4	openssl support


acinclude.m4:
  openssl support
acconfig.h:
  openssl support
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Delete: libmysql/violite.c
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/include/os0file.h:
  Define always WIN_ASYNC_IO, check at run-time if the OS actually supports it

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