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

srv0start.c	InnoDB should now run with the same binary on Win95 and NT: checks OS version


innobase/srv/srv0start.c:
  InnoDB should now run with the same binary on Win95 and NT: checks OS version
innobase/include/os0file.h:
  InnoDB should now run with the same binary on Win95 and NT: checks OS version

os0file.c	Changed file write buffer size in os_file_set_size from 16 MB to 8 MB


innobase/os/os0file.c:
  Removed extraneous fsync and corected a typo in Windows code

myisam/myisamdef.h:
  Added missing declaration
mysql-test/r/innodb.result:
  Changed test based on result from changed optimizer
sql/mysql_priv.h:
  Fixed wrong prototype

viosslfactories.c	BitKeeper file /home/tonu/bk/mysql-4.0/vio/viosslfactories.c
viossl.c	BitKeeper file /home/tonu/bk/mysql-4.0/vio/viossl.c
vio.c   	BitKeeper file /home/tonu/bk/mysql-4.0/vio/vio.c

.del-viotypes.h~f5a38e7326bd50f3	Delete: vio/viotypes.h
.del-violite.h~58d2942a52ea7a83	Delete: vio/violite.h
.del-VioSSLFactoriesFd.h~1d63ae149a63f85	Delete: vio/VioSSLFactoriesFd.h
.del-VioPipe.cc~12cf83b9a2f48f6c	Delete: vio/VioPipe.cc
.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec	Delete: vio/VioSSLAcceptorFd.cc
.del-VioSSL.cc~6e85340b11fa42a8	Delete: vio/VioSSL.cc
.del-VioSSLFactoriesFd.cc~89f6bf5073937947	Delete: vio/VioSSLFactoriesFd.cc
.del-vioelitexx.cc~3eaba70da792a7fc	Delete: vio/vioelitexx.cc
.del-version.cc~7237acf12bed4a97	Delete: vio/version.cc
.del-VioSocket.cc~71c615783f29b5e1	Delete: vio/VioSocket.cc
.del-VioSSL.h~70d367b7ec8cac3e	Delete: vio/VioSSL.h
.del-VioPipe.h~21cebbe61a1da546	Delete: vio/VioPipe.h
.del-VioFd.h~8294293a88c7b4b8	Delete: vio/VioFd.h
.del-VioFd.cc~6e444647affef63b	Delete: vio/VioFd.cc
.del-VioConnectorFd.h~58bc11cdc885b951	Delete: vio/VioConnectorFd.h
.del-VioAcceptorFd.cc~a5a08947a31f88de	Delete: vio/VioAcceptorFd.cc
.del-VioConnectorFd.cc~ddbd7821c43c83a2	Delete: vio/VioConnectorFd.cc
.del-VioAcceptorFd.h~7f9c4358477ba9a3	Delete: vio/VioAcceptorFd.h
.del-Vio.cc~60737ce02ab2bc25	Delete: vio/Vio.cc
.del-Vio.h~f4416b2949647602	Delete: vio/Vio.h
.del-VioSocket.h~a26d535bd5a1a6	Delete: vio/VioSocket.h


BitKeeper/deleted/.del-VioSocket.h~a26d535bd5a1a6:
  Delete: vio/VioSocket.h
BitKeeper/deleted/.del-Vio.cc~60737ce02ab2bc25:
  Delete: vio/Vio.cc
BitKeeper/deleted/.del-Vio.h~f4416b2949647602:
  Delete: vio/Vio.h
BitKeeper/deleted/.del-VioAcceptorFd.cc~a5a08947a31f88de:
  Delete: vio/VioAcceptorFd.cc
BitKeeper/deleted/.del-VioAcceptorFd.h~7f9c4358477ba9a3:
  Delete: vio/VioAcceptorFd.h
BitKeeper/deleted/.del-VioConnectorFd.cc~ddbd7821c43c83a2:
  Delete: vio/VioConnectorFd.cc
BitKeeper/deleted/.del-VioConnectorFd.h~58bc11cdc885b951:
  Delete: vio/VioConnectorFd.h
BitKeeper/deleted/.del-VioFd.cc~6e444647affef63b:
  Delete: vio/VioFd.cc
BitKeeper/deleted/.del-VioFd.h~8294293a88c7b4b8:
  Delete: vio/VioFd.h
BitKeeper/deleted/.del-VioPipe.h~21cebbe61a1da546:
  Delete: vio/VioPipe.h
BitKeeper/deleted/.del-VioSSL.h~70d367b7ec8cac3e:
  Delete: vio/VioSSL.h
BitKeeper/deleted/.del-VioSSLFactoriesFd.cc~89f6bf5073937947:
  Delete: vio/VioSSLFactoriesFd.cc
BitKeeper/deleted/.del-VioSocket.cc~71c615783f29b5e1:
  Delete: vio/VioSocket.cc
BitKeeper/deleted/.del-version.cc~7237acf12bed4a97:
  Delete: vio/version.cc
BitKeeper/deleted/.del-vioelitexx.cc~3eaba70da792a7fc:
  Delete: vio/vioelitexx.cc
BitKeeper/deleted/.del-VioPipe.cc~12cf83b9a2f48f6c:
  Delete: vio/VioPipe.cc
BitKeeper/deleted/.del-VioSSL.cc~6e85340b11fa42a8:
  Delete: vio/VioSSL.cc
BitKeeper/deleted/.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec:
  Delete: vio/VioSSLAcceptorFd.cc
BitKeeper/deleted/.del-VioSSLFactoriesFd.h~1d63ae149a63f85:
  Delete: vio/VioSSLFactoriesFd.h
BitKeeper/deleted/.del-vio-global.h~c261412c01b2f4:
  Delete: vio/vio-global.h
BitKeeper/deleted/.del-violite.h~58d2942a52ea7a83:
  Delete: vio/violite.h
BitKeeper/deleted/.del-viotypes.h~f5a38e7326bd50f3:
  Delete: vio/viotypes.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/mf_qsort.c:
  New sort

sql/sql_handler.cc:
  Fixed insert_fields usage

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.


Docs/manual.texi:
  Small cleanups
configure.in:
  Force close of sockets on HPUX 10.20
mysql-test/t/merge.test:
  Remove used tables
mysys/default.c:
  Support option lines longer than 256 chars.
mysys/mf_keycache.c:
  Split check_keycache tags
sql/mysqld.cc:
  Move things to 'cleanup'.
  Close the slow log at shutdown.
  Always allow debug options
sql/violite.c:
  Change the error tag to vio_error

manual.texi	change "InnoDB consinsten read" to
manual.texi	"InnoDB consistent read" in @node lines
manual.texi	(to match section's actual title)
manual.texi	cleanups to "installing from development source
manual.texi	tree" section


Docs/manual.texi:
  more development tree section changes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ibuf0ibuf.c	Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
log0log.c	Retrieve a dummy value from a function to prevent gcc crashing on HP-UX


innobase/log/log0log.c:
  Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
innobase/ibuf/ibuf0ibuf.c:
  Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/getvar.c:
  atoll() -> strtoll() (portability fix)