include/sslopt-usage.h:
  Paul's patch for --ssl-xxx options for the --help message
scripts/mysqlhotcopy.sh:
  Paul's patch for --port option

include/my_global.h:
  Passed a bug in QNX 6.2 library that affected compiling.

Docs/manual.texi:
  tweaks

Docs/manual.texi:
  tweaks

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

Docs/manual.texi:
  fixups for mysqld_multi section

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

BitKeeper/etc/ignore:
  Added mysys/ste5KbMa to the ignore list
include/my_semaphore.h:
  A small fix for BSDi
sql/sql_update.cc:
  Just a proper error message

changed in table initialization

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  clarify measurement of long_query_time.

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

fix for a nasty bag, that causes a memory corruption+crash on HUGE select distincts, as myisam temp table treats nulls as equal, it constantly returned 141 (duplicate key) error in create_myisam_from_heap

manual.texi	Transactions comprise statements, not the other way around


Docs/manual.texi:
  There is no CREATE ... INSERT.

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


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  DocBook script fixup.
Docs/manual.texi:
  Remove double space (texi2db does not like it).

sql/sql_olap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

sql/sql_delete.cc:
  reverting a bad patch ...
  I wonder how to fix this one ????

mysql-test/r/olap.result:
  some small changes
sql/sql_delete.cc:
  A dirty fix for wrong ref_length returned ...
sql/sql_olap.cc:
  NULL instead of ALL
sql/sql_select.cc:
  This seems like a better solution to me ...
  At least after this a DISTINCT crash bug happens much later.

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


Docs/manual.texi:
  Auto merged

   InnoDB has been selected (InnoDB is now part of the normal binary,
   not the Max binary)


Build-tools/Do-compile:
   - InnoDB is now part of the default binary, no need to add the -max
     suffix in this case

mysql-test/r/query_cache.result:
  query cache resize bug test
mysql-test/t/query_cache.test:
  query cache resize bug test
sql/set_var.cc:
  typo fixed
sql/sql_cache.cc:
  prevent of using very small (unusable) cache size, that cause problem in memory allocation system (query cache resize bug)

Docs/manual.texi:
  fix a couple of index entries

Docs/manual.texi:
  couple of minor touchups

manual.texi	user really is.


Docs/manual.texi:
  point out just how powerful the Windows local anonymous
  user really is.

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

  Fix the crash on AIX in a simple insert


innobase/include/dyn0dyn.h:
  Fix the crash on AIX in a simple insert
innobase/include/dyn0dyn.ic:
  Fix the crash on AIX in a simple insert

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

include/myisam.h:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_check.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_dynrec.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_extra.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_key.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_open.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_packrec.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/myisamdef.h:
  always store alloced_rec_buff_length with the buffer itself

Docs/manual.texi:
  an -> a.  Sheesh.