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

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

Remove not used flag CLIENT_CHANGE_USER


Docs/manual.texi:
  Cleanup examples
acconfig.h:
  Fix for HAVE_QUERY_CACHE
configure.in:
  Fix for HAVE_QUERY_CACHE
include/my_global.h:
  Fix for HAVE_QUERY_CACHE
include/mysql_com.h:
  Remove not used flag CLIENT_CHANGE_USER
libmysqld/libmysqld.c:
  Fix new prototypes

Docs/manual.texi:
  BIT/BOOL are synonyms from TINYINT(1), not CHAR(1)

sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Don't use DBUG library for struct st_my_thread_var to make code less complicated.


Docs/manual.texi:
  Cleanup
acinclude.m4:
  Search after openssl in /usr/local
client/mysql.cc:
  Fix prompt
client/mysqladmin.c:
  Cleanup
client/mysqltest.c:
  Cleanup
include/my_pthread.h:
  Move thread variables to the right location
include/my_sys.h:
  Move thread variables to the right location
include/mysql.h:
  Clean up client prototypes
libmysql/libmysql.c:
  Clean up client prototypes
mysys/my_static.h:
  Cleanup
mysys/my_thr_init.c:
  Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
  Small optimization
sql/net_pkg.cc:
  Cleanup
sql/sql_parse.cc:
  Allow VARCHAR(0)

client/mysql.cc:
  Fixed typos
configure.in:
  Cleanup
sql/ha_innobase.cc:
  Safety patch
sql/item_strfunc.cc:
  cleanup

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

DBUG_ macro cleanup
buffer boundary cleanup
This changeset, although not fully tested, works for me better than 
anything I've had so far, including what is in the repository. I will 
push it unless something crashes while I am writing this :-)


mysql-test/r/rpl000014.result:
  updated result
mysql-test/r/rpl000015.result:
  updated result
mysql-test/r/rpl000016.result:
  updated result
mysql-test/r/rpl_log.result:
  new result
mysys/mf_iocache.c:
  DBUG_ cleanup
mysys/mf_iocache2.c:
  DBUG_ fix
sql/log.cc:
  added relay_log_space_limit
sql/mysqld.cc:
  relay_log_space_limit
sql/slave.cc:
  relay_log_space_limit
sql/slave.h:
  relay_log_space_limit
sql/sql_class.h:
  relay_log_space_limit
sql/sql_repl.cc:
  fixed buffer overrun bug

Docs/manual.texi:
  Mods related to UNSIGNED floating-point types.

libmysqld/examples/Makefile.am:
  honor client link flags in libmysqld example builds
vio/Makefile.am:
  honor client link flags in vio test program builds

sql/log_event.cc:
  do not complain if the expected error was on the ignore list but we did not
  get it

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

If no problems are discovered in the next week, this will make the replication
code ready for 4.0.2 release.


dbug/dbug.c:
  cleanup of my previous fix
sql/mysqld.cc:
  fixed a REALLY NASTY BUG - slave threads were being launched before 
  initialization of global thread keys. Thus if the slave thread was slow
  to start everything worked fine, but if it started quickly, we would get
  into trouble using the unitinialized keys
sql/net_pkg.cc:
  make net_printf() work with 0 error code taking the third argument as 
  format string in that case
sql/slave.cc:
  misc fix-ups and debugging instrumentations
sql/slave.h:
  added skip_log_purge member
sql/sql_class.cc:
  debugging instrumentation to track down random memory corruption
sql/sql_class.h:
  added debugging sentry to THD to track down memory corruption
sql/sql_repl.cc:
  fixed bugs in CHANGE MASTER

into teton.kitebird.com:/home/paul/mysql-4.0

Docs/manual.texi:
  Clarify that LIMIT args must be integer constants.

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

Docs/manual.texi:
  Add NOT BETWEEN operator.

Docs/manual.texi:
  Change note mod, 4.0.2.

Docs/manual.texi:
  misc. small fixes

Docs/manual.texi:
  test

Docs/manual.texi:
  sendmail test

manual.texi	Make a few -ized -> -ised changes.


Docs/manual.texi:
  Fix a few glitches in my last commit.
  Make a few -ized -> -ised changes.

manual.texi	- Clean up DES function descriptions.
manual.texi	- Correct incorrect INET_NTOA() description.
manual.texi	- Break too-long lines in a few query examples.


Docs/manual.texi:
  - Clean up some privilege name references.
  - Clean up DES function descriptions.
  - Correct incorrect INET_NTOA() description.
  - Break too-long lines in a few query examples.

manual.texi	Fix a too-long-line in query example.


Docs/manual.texi:
  Change note mods, 4.0.2.
  Fix a too-long-line in query example.

Docs/manual.texi:
  test

Docs/manual.texi:
  test

Docs/manual.texi:
  Added text fof bug fixes
readline/Makefile.am:
  Bug fix for coredump of mysql program with some Ctrl+keys
sql/convert.cc:
  A bug fix for using SET CHAR... SET on columns > 64K
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  fixing my texi errors

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


Docs/manual.texi:
  Auto merged