BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-linux-build:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

Docs/manual.texi:
  Updated TODO for 4.0
sql/mysqld.cc:
  Cleanup
sql/opt_range.cc:
  Cleanup

Docs/manual.texi:
  Fixed example
sql/mysqld.cc:
  Cleanup

This fixes that mysamchk --sort-records works on windows.


myisam/mi_check.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_close.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_dynrec.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_open.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_statrec.c:
  Ensure that share->tot_locks s updated correctly
myisam/myisamchk.c:
  Ensure that share->tot_locks s updated correctly

mysys/my_pthread.c:
  Portability fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

header in x86 assemler files instead of eating the whole file


Build-tools/mysql-copyright-2:
  Handle copyright headers in *-x86.s files correctly (they do not
  use C style comments)

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

into fred.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged

Added missing checking of no_keyread


Docs/manual.texi:
  Fixed wrong example
myisam/myisamchk.c:
  Removed not needed include file
mysys/my_pthread.c:
  Fix for HPUX
mysys/my_thr_init.c:
  Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
  Cleanup
sql/sql_lex.cc:
  Removed not needed initialization
sql/sql_parse.cc:
  Cleanup of checking of user resources
sql/sql_select.cc:
  Added checking of no_keyread

with aggregating functions.

This consistently crashed Mysql

for a seemingly impoosbile conds in WHERE....

This crashed MySQL in 4.0.2


Docs/manual.texi:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/r/select.result:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/t/select.test:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
sql/opt_range.cc:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....

Docs/manual.texi:
  SCCS merged

A better fix would be to have a map of tables that are not used at all, 
and to annul just fledls in that TABLE.

BitKeeper/etc/logging_ok:
  auto-union
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
client/mysqldump.c:
  SCCS merged

client/mysqldump.c:
  Changes adviced by Monty
include/my_aes.h:
  Changes adviced by Monty
include/rijndael.h:
  Changes adviced by Monty
include/sha1.h:
  Changes adviced by Monty
mysys/my_aes.c:
  Changes adviced by Monty
mysys/rijndael.c:
  Changes adviced by Monty
mysys/sha1.c:
  Changes adviced by Monty
sql/item_strfunc.cc:
  Changes adviced by Monty

Adjusting target versions for implementation of new features.
Removed already implemented features from todo.

Fixed typo ("create temporary table" privilege is really "create temporary tables" privilege). 

Fix some grammatical errors using 's instead of s for plural.

Docs/Support/update-reserved-words.pl:
  Issue a bk edit before changing the manual file.

into fred.bitbike.com:/home/arjen/mysql-4.0

delete.

Docs/mirrors.texi:
  SCCS merged

  update mirrors


Docs/mirrors.texi:
  update mirrors

sql/sql_delete.cc:
  Removed unnecessary code

Docs/manual.texi:
  Updated Table is full section.
client/mysql.cc:
  Applied patch for fixing tee()
sql/sql_acl.cc:
  Added include file

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

SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges 


BitKeeper/deleted/.del-mysql_new_fix_privilege_tables.sh~b1664b401375eece:
  Delete: scripts/mysql_new_fix_privilege_tables.sh
Docs/manual.texi:
  Updated manual for privilege changes.
include/mysqld_error.h:
  new error messages
mysql-test/install_test_db.sh:
  Updated to use new privileges
mysql-test/r/grant_cache.result:
  Updated to use new privileges
mysql-test/r/rpl000017.result:
  Updated to use new privileges
mysql-test/t/rpl000017.test:
  Updated to use new privileges
mysys/safemalloc.c:
  Cleanup
scripts/mysql_fix_privilege_tables.sh:
  Updated to use new privileges
scripts/mysql_install_db.sh:
  Updated to use new privileges
sql/field.h:
  Cleanup
sql/item_strfunc.cc:
  Updated to use new privileges
sql/lex.h:
  Updated to use new privileges
sql/log.cc:
  Updated to use new privileges
sql/mysql_priv.h:
  Updated to use new privileges
sql/mysqld.cc:
  Updated to use new privileges
sql/repl_failsafe.cc:
  Updated to use new privileges
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
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/slave.cc:
  Portability cleanup
sql/sql_acl.cc:
  Updated to use new privileges
sql/sql_acl.h:
  Updated to use new privileges
sql/sql_base.cc:
  Remove not used include file
sql/sql_class.cc:
  Comment cleanup
sql/sql_class.h:
  Updated to use new privileges
  Comment cleanups
sql/sql_insert.cc:
  Updated to use new privileges
sql/sql_lex.h:
  Indentation cleanup
sql/sql_parse.cc:
  Updated to use new privileges
sql/sql_repl.cc:
  Updated to use new privileges
  Comment cleanup
sql/sql_show.cc:
  Updated to use new privileges
sql/sql_yacc.yy:
  Updated to use new privileges
  Sorted some tockens for easer merge to 4.1 in the future.
sql/table.h:
  Updated to use new privileges
tests/grant.pl:
  Updated to use new privileges
tests/grant.res:
  Updated to use new privileges

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

Still not able to make a proper test case as this crashes on files 
where key and data pointers are 4 bytes each. Possibly a proper 
test case would require myisampack.


sql/sql_lex.cc:
  Just in case ...

Docs/manual.texi:
  fix prefix/suffix mixup.

Build-tools/Do-linux-build:
  Create debug symbols so make_binary_distribution adds them to the tarball
  as well