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.

sql/sql_select.cc:
  Auto merged
innobase/row/row0mysql.c:
  merge (user 4.1 version)

 - added build option "--with-debug" to build unstripped binaries with
   debugging enabled


Build-tools/Do-compile:
   - added build option "--with-debug" to build unstripped binaries with
     debugging enabled

 - "--config-env" can now be given more than once
 - don't be smart about version suffixes


Build-tools/Do-compile:
   - "--config-env" can now be given more than once
   - don't be smart about version suffixes

This only showed up under heavy load.

sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

  Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log


innobase/buf/buf0buf.c:
  Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log
innobase/btr/btr0btr.c:
  Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log