Docs/manual.de.texi:
  Fixed up German manual for mysql.de website (with English @node lines).
  @menu blocks are not filled so .info won't look nice.

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  add missing change note for mysql_real_escape_string()

into hynda.mysql.fi:/home/my/bk/mysql-4.0-quick-fixes


include/my_global.h:
  Auto merged

config.guess:
  Added detection for QNX.
config.sub:
  Added detection for QNX.
include/m_ctype.h:
  QNX already used some of the symbols, changed names.
include/my_global.h:
  For QNX.
readline/vi_mode.c:
  For QNX.

Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged

Docs/manual.texi:
  Fix after merge
include/my_global.h:
  merge fix
mysql-test/r/create.result:
  merge fix
mysys/thr_alarm.c:
  Fix for using --debug with alarms

configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
client/mysqlimport.c:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged

Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT


Docs/manual.texi:
  Fixed symlink examples.
heap/hp_rfirst.c:
  Remove not needed patch.
mysql-test/r/heap.result:
  Added test case for HEAP + many deletes
mysql-test/t/heap.test:
  Added test case for HEAP + many deletes
mysys/mf_loadpath.c:
  Resolve path's even if they don't end in '/'
scripts/mysqldumpslow.sh:
  Fix for new dump format.
sql/handler.cc:
  Fix for HEAP tables with many rows deleted.
sql/sql_acl.cc:
  Add '' arround database names in SHOW GRANT

Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Added help for --local-infile
client/mysqlimport.c:
  Merge with 4.0.
  Patch for LOCAL INFILE handling
configure.in:
  cleanup
include/global.h:
  Fix for bug on intel where (int32) 1 << 32 == 1
mysql-test/r/create.result:
  Test of CREATE TABLE with 32 keys
mysql-test/t/create.test:
  Test of CREATE TABLE with 32 keys
scripts/mysqlhotcopy.sh:
  Patch for databasenames with space.
sql/ha_isam.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisam.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisammrg.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/mysqld.cc:
  Added help for --local-infile
sql/sql_acl.cc:
  Allow SET PASSWORD of anonymous user
sql/table.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1

into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0

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

  Add a note about InnoDB Hot Backup


Docs/manual.texi:
  Add a note about InnoDB Hot Backup

 slave start io_thread 
 slave start sql_thread
same for stop


sql/lex.h:
  slave start <options>
sql/sql_lex.cc:
  slave start <options>
sql/sql_lex.h:
  slave start <options>
sql/sql_repl.cc:
  slave start <options>
sql/sql_yacc.yy:
  slave start <options>

sql/mysqld.cc:
  Auto merged

into mysql.sashanet.com:/reiser-data/mysql-4.0

not yet tested - will not be pushed for a few hours - need to commit in 
order to pull


BUILD/compile-pentium-debug:
  link statically
sql/slave.cc:
  properly seek the position when recovering from a partial read

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

I have tested it with tcpd wrapper and it worked on Linux.
I did not change setttings in hosts.deny, as I did not dare too.

sql/slave.cc:
  fixed wrong invocation of safe_sleep()

into mysql.sashanet.com:/reiser-data/mysql-4.0


include/my_sys.h:
  Auto merged

include/my_sys.h:
  added DBUG_ASSERT_LOCK()
sql/slave.cc:
  use DBUG_ASSERT_LOCK()

  Update
mirrors.texi:
  Add new mirrors
manual.texi:
  Remove link to mxODBC


Docs/manual.texi:
  Remove link to mxODBC
Docs/mirrors.texi:
  Add new mirrors
Docs/Flags/turkey.gif:
  Update
Docs/Flags/turkey.eps:
  Update
Docs/Flags/norway.gif:
  Update
Docs/Flags/norway.eps:
  Update

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Document when --xml was added to mysql/mysqldump.

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged

Fix bug when using option groups


libmysql/libmysql.c:
  Fix bug when using option groups
myisam/myisamchk.c:
  Portability fix
mysys/my_getopt.c:
  Portability fix

Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged

Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch