Docs/manual.texi:
  Changelog
configure.in:
  Version update
isam/pack_isam.c:
  Fixed copyright
myisam/mi_cache.c:
  Indentation fixup

Docs/manual.texi:
  Fixed example
sql/mysqld.cc:
  Cleanup

mysys/my_pthread.c:
  Portability fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

header in x86 assemler files instead of eating the whole file


Build-tools/mysql-copyright-2:
  Handle copyright headers in *-x86.s files correctly (they do not
  use C style comments)

Build-tools/Do-linux-build:
  Create debug symbols so make_binary_distribution adds them to the tarball
  as well

added a new replication test


sql/sql_base.cc:
  f

Docs/manual.texi:
  changelog

into nick.leippe.com:/home/nick/mysql/mysql

added respective test case


sql/slave.cc:
  fixed load table from master hang when host is empty

Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name


Docs/manual.texi:
  Update of TRUNCATE() information
configure.in:
  Fix for HPUX
extra/resolveip.c:
  Fix for SCO
include/my_net.h:
  Fix for HPUX
libmysql/libmysql.c:
  Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
  Test of new TRUNCATE handling
mysql-test/t/func_math.test:
  Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
  Portability fix
sql/item_func.cc:
  Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
  Fix NULL handling for DESCRIBE table_name

This fix should be merged into 4.0 and 4.1

  Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny


sql/ha_innobase.cc:
  Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny

Remove end space from ENUM and SET strings


mysql-test/t/type_enum.test:
  Test of end space in enum's
Docs/manual.texi:
  Changelog
include/my_sys.h:
  Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
  Test of end space in enums
mysys/Makefile.am:
  change stripp_sp -> strip_sp
mysys/mf_strip.c:
  change stripp_sp -> strip_sp
sql/sql_db.cc:
  change stripp_sp -> strip_sp
sql/sql_parse.cc:
  change stripp_sp -> strip_sp
  Remove end space from ENUM and SET strings

Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test


BUILD/SETUP.sh:
  Fixes for gcc 3.1
extra/resolveip.c:
  Cleanup
include/my_net.h:
  Portability fix for SCO
mysql-test/t/type_decimal.test:
  Portability fix for FreeBSD
mysys/Makefile.am:
  Portability fix for OSF1
mysys/raid.cc:
  Portability fix for OSF1

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

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


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

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

BitKeeper/deleted/.del-sel000004.test~445526a8a20de101:
  Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000004.result~360af2095c88cb8c:
  Delete: mysql-test/r/sel000004.result

did not apply)

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)

(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 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.

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

mysql_copyright to replace it


client/mysqlcheck.c:
  Reformatted license statement in usage output to enable mysql_copyright
  to replace it

Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists


Build-tools/Do-linux-build:
  Only use the "--with-other-libc" parameter, if another libc actually
  exists at this location
Makefile.am:
  Removed hard-coded tar binary name
configure.in:
  Added check for GNU tar with various names
sql/sql_yacc.yy:
  Added semicolons to several expressions to make bison 1.31 and above
  happy when used in Yacc compatibility mode. From the bison NEWS:
  
    "Bison has always permitted actions such as { $$ = $1 }: it adds the
    ending semicolon.  Now if in Yacc compatibility mode, the semicolon
    is no longer output: one has to write { $$ = $1; }."
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changelog
mysql-test/r/type_datetime.result:
  Test of datetime optimization
mysql-test/t/type_datetime.test:
  Test of datetime optimization