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

include/my_sys.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
include/myisam.h:
  post-merge
myisam/mi_write.c:
  post-merge

parallel read access to IO_CACHE


include/my_sys.h:
  parallel read access to IO_CACHE
include/myisam.h:
  multithreaded repair-by-sort code
myisam/mi_cache.c:
  parallel read access to IO_CACHE
  misc cleanups
myisam/mi_check.c:
  multithreaded repair-by-sort code
myisam/myisamchk.c:
  multithreaded repair-by-sort code
myisam/myisamdef.h:
  multithreaded repair-by-sort code
myisam/sort.c:
  multithreaded repair-by-sort code
mysys/mf_iocache.c:
  parallel read access to IO_CACHE

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged

This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.


Docs/manual.texi:
  Update of SQL_JOIN_MAX_SIZE information3602
client/mysqldump.c:
  comment cleanup
include/my_aes.h:
  General cleanup for new file
include/rijndael.h:
  General cleanup for new file
include/sha1.h:
  General cleanup for new file
mysys/my_aes.c:
  General cleanup for new file
mysys/rijndael.c:
  General cleanup for new file
mysys/sha1.c:
  General cleanup for new file
sql/ha_berkeley.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_innodb.cc:
  Merge with 3.23.x
sql/ha_innodb.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_isam.cc:
  Moved things to table_flags()
sql/ha_isam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.cc:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisammrg.h:
  Made keyread (key scanning) a key specific attribute.
sql/handler.h:
  Made keyread (key scanning) a key specific attribute.
sql/item_strfunc.cc:
  Cleanup of AES_xxx code
sql/opt_range.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_base.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_cache.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed wrong patch to fulltext problem
sql/table.cc:
  Made keyread (key scanning) a key specific attribute.
sql/table.h:
  Made keyread (key scanning) a key specific attribute.

make some new mistakes.

  Emphasize that the size and the signedness of integer types has to be the same in a foreign key constraint


Docs/manual.texi:
  Emphasize that the size and the signedness of integer types has to be the same in a foreign key constraint

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

This one is better, but should not be final.

Better fix is to make some changes in ha_myisammrg::index_read

This patch also reverts my previous one ...

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.