Docs/manual.texi:
  Auto merged

Docs/glibc-2.2.5.patch:
  Auto merged
strings/longlong2str-x86.s:
  Auto merged
strings/strings-x86.s:
  Auto merged

Fixed memory overrun bug in glibc patch
Updated french error messages


Docs/glibc-2.2.5.patch:
  Fixed memory overrun bug in glibc patch
sql/share/french/errmsg.txt:
  Updated french error messages (patch from Loic Le Loarer)
strings/longlong2str-x86.s:
  Updated from MySQL 4.0 (to make them work with gcc 3.0)
strings/strings-x86.s:
  Updated from MySQL 4.0 (to make them work with gcc 3.0)

Docs/glibc-2.2.5.patch:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_parse.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0

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


sql/sql_parse.cc:
  Auto merged

Before this change LOCK TABLES worked only with global and table
level privileges.

Docs/manual.texi:
  Added info about LIKE optimization
mysql-test/r/func_like.result:
  Test of new LIKE optimization
mysql-test/t/func_like.test:
  Test of new LIKE optimization

Docs/manual.texi:
  Fix typo, semi-redundancy.

(thanks to Yuri Dario <mc6530@mclink.it> for pointing this out)


Makefile.am:
  Added OS/2 subdirectory to source distribution
configure.in:
  Added OS/2 subdirectory to source distribution

Update of glibc patch from MySQL 4.0


Docs/glibc-2.2.5.patch:
  Update of patch from MySQL 4.0
Docs/manual.texi:
  ChangeLog
sql/item_strfunc.cc:
  Fix bug in CONCAT_WS()
sql/share/italian/errmsg.txt:
  Update of new error messages

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


BitKeeper/etc/logging_ok:
  auto-union

BUILD/compile-pentium-gcov:
  Remove optimization, add innodb and bdb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.de.texi:
  Copied new section to German manual (to be translated).
Docs/manual.texi:
  Re-merged Monty's additions with Arjen's original fixups.

Docs/manual.texi:
  Small changes regarind user resources
client/mysqlbinlog.cc:
  Applied patch to support --database
mysql-test/r/func_isnull.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/show_check.result:
  New test results
mysql-test/r/type_datetime.result:
  New test results
mysql-test/r/type_decimal.result:
  New test results
mysql-test/r/type_float.result:
  New test results
mysys/my_gethostbyname.c:
  Fixed type on last push
mysys/my_pthread.c:
  Fixed type on last push
sql/sql_select.cc:
  Fixed bug in LIMIT handling

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into sinisa.nasamreza.org:/mnt/mail/work/mysql


mysys/my_pthread.c:
  Auto merged

This time I did it "by the book" as this function can return any 
of the down cited values after timeout !! This is now done 100 %
according to HP-UX DCE documentation.

This made Hewlett-Packard very happy.

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
  Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
  Auto merged
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/raid.cc:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

Changed some status variable names
Fix bug in GRANT ... PASSWORD string


Docs/manual.texi:
  Update of variable names
include/my_net.h:
  New my_gethostbyname_r() handling
include/my_pthread.h:
  New my_gethostbyname_r() handling
libmysql/Makefile.shared:
  New my_gethostbyname_r() handling
libmysql/libmysql.c:
  New my_gethostbyname_r() handling
mysys/Makefile.am:
  New my_gethostbyname_r() handling
mysys/my_pthread.c:
  New my_gethostbyname_r() handling
mysys/my_thr_init.c:
  New my_gethostbyname_r() handling
sql/hostname.cc:
  New my_gethostbyname_r() handling
sql/mini_client.cc:
  New my_gethostbyname_r() handling
sql/mysqld.cc:
  change some status variable names
sql/sql_acl.cc:
  Fix bug in GRANT ... PASSWORD string

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Update of new GRANT options
libmysql/manager.c:
  Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
  new test case
mysql-test/t/select_found.test:
  new test case
sql/mysqld.cc:
  Change names of some status variables

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

Various cleanups in News 4.0.2 section.

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