mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_select.cc:
  Merge

unlink socket file if mysqld dies on startup
Some optimization of AND expressions


mysql-test/r/func_time.result:
  Update for new week() handling
mysql-test/t/func_time.test:
  Update for new week() handling
sql/item_cmpfunc.cc:
  Optimization of IF( and-expression,,)
sql/item_cmpfunc.h:
  Optimization of AND expressions
sql/item_timefunc.cc:
  Extended WEEK() to be able to handle ISO weeks.
sql/mysqld.cc:
  unlink socket file if mysqld dies on startup
sql/sql_base.cc:
  Fixed problem with SIGHUP and INSERT DELAYED
tests/Makefile.am:
  Added missing myisam-big-rows.tst file to source distribution

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

This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL


mysql-test/r/bdb.result:
  Fix results after serges last patch
mysql-test/r/innodb.result:
  Fix results after serges last patch
mysql-test/r/null.result:
  Update for new AND handling of NULL
scripts/mysqld_safe.sh:
  Fix 'isroot' test to work even if user is not root
sql/item.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_base.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_parse.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_select.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_yacc.yy:
  Fixed that NULL and 0 returns 0 instead of NULL

 - fixed yet another wrong result after error messages had been changed


mysql-test/r/bdb.result:
   - fixed yet another wrong result after error messages had been changed

 - fixed test results after error messages had been modified


mysql-test/r/innodb.result:
   - fixed test results after error messages had been modified

innobase/log/log0log.c:
  Removed compiler warnings

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

mysql-test/r/isam.result:
  fixed result for new errmsg
mysql-test/r/select.result:
  fixed result for IGNORE/USE INDEX

BitKeeper/etc/ignore:
  auto-union

BitKeeper/etc/ignore:
  Added depcomp to the ignore list

  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE


sql/ha_innodb.cc:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE

  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE


innobase/include/btr0btr.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/btr0pcur.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/db0err.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/btr0pcur.ic:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/btr/btr0btr.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/page/page0page.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/row/row0sel.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE

configure.in:
  Move +O2 up as with_debug wasn't defined at this point

Docs/internals.texi:
  Added protocol information
  (needs to be converted to texi and merged with the old documentation)
configure.in:
  Updates for HP compiler (cc)
include/my_global.h:
  Add option to handle bugs in 'inline' for HP compiler
libmysql/password.c:
  Portability fix (for HP compiler)
mysys/hash.c:
  Portability fix (for HP compiler)
mysys/my_static.c:
  Portability fix (for HPUX11)
mysys/my_static.h:
  Portability fix (for HPUX11)
mysys/my_tempnam.c:
  Portability fix (for HPUX11)
sql/sql_analyse.cc:
  Fixed bug in decimal handling

sql/item_cmpfunc.cc:
  Create an AND expression from two expressions
sql/item_cmpfunc.h:
  Create an AND expression from two expressions

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


BitKeeper/etc/gone:
  auto-union

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


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/gone:
  auto-union

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

also for InnoDB that supports CHECK table but not REPAIR

into mysql.com:/home/walrus/bk/40

into mysql.com:/home/walrus/bk/323

into mysql.com:/home/walrus/bk/40


BitKeeper/etc/logging_ok:
  auto-union

  Removed compiler warnings about wrong printf formats


innobase/log/log0recv.c:
  Removed compiler warnings about wrong printf formats

into mysql.com:/space/my/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

proper escaping of databases with '_' in their name.
More explanations in the manual.