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.

   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:
  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.

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

into mysql.com:/my/mysql-4.0

since it is AIX specific only and compilers on other platforms issued
warnings about it.


include/my_sys.h:
  "#pragma alloca" is for IBM AIX only

Docs/manual.texi:
  fix glitch in time value description

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


Docs/manual.texi:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

mysql_priv.h:
  Added have_berkeley_db and have_innodb.
ha_innodb.h:
  Removed have_innodb.
ha_berkeley.h:
  Removed have_berkeley_db.


sql/ha_berkeley.h:
  Removed have_berkeley_db.
sql/ha_innodb.h:
  Removed have_innodb.
sql/mysql_priv.h:
  Added have_berkeley_db and have_innodb.

Docs/manual.texi:
  fix typos

Docs/manual.texi:
  Clarify (?) INSERT ...VALUES(DEFAULT)

Docs/manual.texi:
  Auto merged

BitKeeper/deleted/.del-insert_set.test~35be5a761a410ac1:
  Delete: mysql-test/t/insert_set.test
BitKeeper/deleted/.del-insert_set.result~fca5025db098c892:
  Delete: mysql-test/r/insert_set.result
Docs/manual.texi:
  Changelog
mysql-test/r/insert.result:
  Test new insert ... (DEFAULT)
mysql-test/t/insert.test:
  Test new insert ... (DEFAULT)
sql/item.cc:
  Indentation cleanup

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

bugfix: uniques did not contributed to MYI tot_length estimation, which resulted in "Index file full" error on huge SELECT DISTINCT's

Docs/manual.texi:
  fix typo

Docs/manual.texi:
  fix typo

Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.


Docs/manual.texi:
  Changelog & recent incompatible changes to 4.0.3
include/mysqld_error.h:
  New error messages
myisam/ft_boolean_search.c:
  Removed compiler warning
myisam/mi_check.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_dynrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_extra.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_key.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_open.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_packrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/myisamdef.h:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/sort.c:
  Fixed uninitialized variable
mysql-test/r/insert_set.result:
  Change test case to use database foo
mysql-test/r/union.result:
  Test wrong usage of union
mysql-test/t/insert_set.test:
  Test bug in insert
mysql-test/t/union.test:
  Test wrong usage of union
sql/item.h:
  Indentation cleanup
sql/item_cmpfunc.h:
  Indentation cleanup
sql/item_func.h:
  Indentation cleanup
sql/item_strfunc.h:
  Indentation cleanup
sql/item_sum.h:
  Indentation cleanup
sql/item_timefunc.h:
  Indentation cleanup
sql/item_uniq.h:
  Indentation cleanup
sql/mysql_priv.h:
  Fix that we always generate an error message when calling YYABORT
sql/mysqld.cc:
  Changed command line arguments regarding locking to always use --external-locking
  Disable external locking by default
sql/procedure.h:
  Cleanup
sql/set_var.cc:
  change locking -> external_locking
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
mysql-test/r/olap.result:
  Removed CUBE/ROLLUP
mysql-test/t/olap.test:
  Removed CUBE/ROLLUP
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Removed wrong patch for INSERT...
sql/sql_insert.cc:
  Fix bug in INSERT ... SET db_name.table_name.column_name
sql/sql_lex.h:
  Changed NON_EXISTIONG_ONE -> UNSPECIFIED_OLAP_TYPE
sql/sql_olap.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_parse.cc:
  Removed wrong implementation of CUBE/ROLLUP
  Added function to give better error messages
sql/sql_select.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_union.cc:
  Added comment
sql/sql_yacc.yy:
  Fix that we always generate an error message when calling YYABORT

sql/Makefile.am:
   - Added missing file "set_var.h" to distribution
   - Fixed indendation

Docs/manual.texi:
  Auto merged
sql/sql_base.cc:
  Auto merged