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

  Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout


innobase/row/row0mysql.c:
  Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout

  Fix hang introduced by selective deadlock resolution
srv0srv.c, row0mysql.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE


innobase/include/que0que.h:
  Fix hang introduced by selective deadlock resolution
innobase/include/trx0trx.h:
  Fix hang introduced by selective deadlock resolution
innobase/include/ut0ut.h:
  Fix hang introduced by selective deadlock resolution
innobase/lock/lock0lock.c:
  Fix hang introduced by selective deadlock resolution
innobase/log/log0log.c:
  Fix hang introduced by selective deadlock resolution
innobase/que/que0que.c:
  Fix hang introduced by selective deadlock resolution
innobase/row/row0mysql.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE
innobase/srv/srv0srv.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE
innobase/trx/trx0sys.c:
  Fix hang introduced by selective deadlock resolution
innobase/trx/trx0trx.c:
  Fix hang introduced by selective deadlock resolution

client/mysqlbinlog.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_udf.cc:
  Portability fix
sql/mysqld.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix

configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

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

Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE


mysql-test/r/rpl_log.result:
  Update of results after last replication change
mysql-test/r/variables.result:
  Test of new variables @@rand_seed1 and @@rand_seed2
mysql-test/t/variables.test:
  Test of new variables @@rand_seed1 and @@rand_seed2
sql/field.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/field.h:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/item_func.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
  More debug information
sql/log_event.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log_event.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/set_var.cc:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/set_var.h:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/slave.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_acl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_base.cc:
  Store DROP of temporary tables in binlog cache
sql/sql_class.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_db.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_delete.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_insert.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_lex.h:
  DROP TEMPORARY TABLE
sql/sql_load.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_parse.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_rename.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_table.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_update.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_yacc.yy:
  DROP TEMPORARY
sql/table.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/unireg.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions

client/mysqlbinlog.cc:
  Portability fix
configure.in:
  Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
  Portability fix
include/myisam.h:
  Portability fix
include/queues.h:
  Portability fix
innobase/include/ut0ut.h:
  Portability fix
innobase/log/log0log.c:
  Portability fix
innobase/rem/rem0cmp.c:
  Portability fix
innobase/trx/trx0sys.c:
  Portability fix
isam/pack_isam.c:
  Portability fix
myisam/ft_boolean_search.c:
  Portability fix
myisam/mi_dynrec.c:
  Code change to go around bug in Forte 5.0
myisam/sort.c:
  Portability fix
mysys/my_aes.c:
  Portability fix
scripts/Makefile.am:
  Support for ASFLAGS
scripts/mysqlbug.sh:
  Support for ASFLAGS
sql/field.cc:
  Portability fix
sql/filesort.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/ha_innodb.cc:
  Portability fix
  Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
  Portability fix
sql/ha_myisam.cc:
  Portability fix
sql/ha_myisammrg.cc:
  Portability fix
sql/hash_filo.h:
  Portability fix
sql/hostname.cc:
  Portability fix
sql/item_cmpfunc.h:
  Indentation change
sql/item_func.cc:
  Portability fix
sql/item_func.h:
  Portability fix
sql/log.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/mysql_priv.h:
  Portability fix
sql/mysqld.cc:
  Portability fix
  Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/slave.cc:
  Portability fix
sql/slave.h:
  Portability fix
sql/sql_acl.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_cache.cc:
  Portability fix
sql/sql_cache.h:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_manager.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
BUILD/compile-solaris-sparc-forte:
  C
sql/sql_udf.cc:
  Portability fix
sql/sql_update.cc:
  Portability fix
strings/Makefile.am:
  Portability fix
strings/bmove_upp-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
  Cleanup
strings/strappend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
  Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted