into mysql.com:/home/pz/mysql/mysql-4.0

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

into mysql.com:/home/pz/mysql/mysql-4.0

  cleanup


sql/sql_yacc.yy:
  cleanup

into mysql.com:/home/pz/mysql/mysql-4.0

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


sql/mysqld.cc:
  Auto merged

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~9d3403dbb31de075:
  'Auto converge rename'

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

  Include univ.i before any system headers to remove a large file compilation failure on AIX


innobase/pars/pars0grm.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/lexyy.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX

into mysql.com:/home/nick/mysql/repository/mysql-4.0

   differences in HPUX11)


acconfig.h:
   - fixed typo
configure.in:
   - replaced HPUX -> HPUX10
   - added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
   - replaced HPUX -> HPUX10
include/my_net.h:
   - replaced HPUX -> HPUX10
include/my_pthread.h:
   - replaced HPUX -> HPUX10
libmysql/libmysql.c:
   - replaced HPUX -> HPUX10
mysys/my_append.c:
   - replaced HPUX -> HPUX10
mysys/my_copy.c:
   - replaced HPUX -> HPUX10
mysys/my_pthread.c:
   - replaced HPUX -> HPUX10
mysys/my_redel.c:
   - replaced HPUX -> HPUX10
mysys/thr_alarm.c:
   - replaced HPUX -> HPUX10
sql/mini_client.cc:
   - replaced HPUX -> HPUX10
sql/mysqld.cc:
   - replaced HPUX -> HPUX10
strings/do_ctype.c:
   - replaced HPUX -> HPUX10

STOP|START SLAVE
rather than SLAVE STOP|START, which is now deprecated and should be deleted in 4.1

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

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

Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error

 - fixed essential piece missing from last merge with 3.23 tree
   (InnoDB option)
 - Added "autoextend" parameter to InnoDB startup options to be able
   to pass the full sql-bench run without hitting an "table space full"
   error


Build-tools/Do-compile:
   - fixed essential piece missing from last merge with 3.23 tree
     (InnoDB option)
   - Added "autoextend" parameter to InnoDB startup options to be able
     to pass the full sql-bench run without hitting an "table space full"
     error

   necessary (required to actually pass the sql-bench without aborting
   with "table space full")


Build-tools/Do-compile:
   - Enable InnoDB to autoextend the table space if necessary (required to
     actually pass the sql-bench without aborting with "table space full")

into mysql.com:/home/pz/mysql/mysql-4.0

into mysql.com:/home/nick/mysql/mysql-4.0


sql/item_func.cc:
  Auto merged

myisam/mi_delete_all.c:
  truncate both MYI and MYD files to avoid warnings on CHECK TABLE

into mysql.com:/home/pz/mysql/mysql-4.0

   -p option for cp and the -r option for scp (thank to Paul DuBois for
   the patch)
 - fixed a typo

into genie.(none):/home/hf/work/04


BitKeeper/etc/logging_ok:
  auto-union

libmysqld/lib_sql.cc:
  Necessary thd->scramble initialization added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

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

into mysql.com:/home/pz/mysql/mysql-4.0

Docs/manual.texi:
  Auto merged