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

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

(as when previous myrg_rkey failed, e.g. found nothing)


myisammrg/myrg_delete.c:
  style fix
myisammrg/myrg_locking.c:
  style fix
myisammrg/myrg_rnext.c:
  do not crash on rprev/rnext if no current table (as when previous rkey failed, e.g. found nothing)
myisammrg/myrg_rprev.c:
  do not crash on rprev/rnext if no current table (as when previous rkey failed, e.g. found nothing)
myisammrg/myrg_rrnd.c:
  style fix
myisammrg/myrg_rsame.c:
  style fix
myisammrg/myrg_update.c:
  style fix
myisammrg/myrg_write.c:
  style fix

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

my_getopt-related style changes in myisamchk.c


include/myisam.h:
  mi_check T_xxx options massaged. T_REP_PARALLEL added
myisam/mi_check.c:
  mi_check T_xxx options massaged
myisam/myisamchk.c:
  mi_check T_xxx options massaged
  my_long_option structure reformatted
  s/(argument && \*argument=='0')/(argument == disable_my_option)/
sql/ha_myisam.cc:
  mi_check T_xxx options massaged

mysql-test/r/type_decimal.result:
  Results for More tests
mysql-test/t/type_decimal.test:
  More tests to handle exponent cases
sql/field.cc:
  Handle string with exponent for decimal type

into linux.local:/data/mysql-4.0-root

mysys/sha1.c:
  Fix Warning messages

include/Makefile.am to resolve broken dependencies in "make distcheck"

Added -DHAVE_BROKEN_REALPATH to the Mac OS X (darwin) compile options in
configure.in


BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
  Delete: include/getopt.h
configure.in:
  Added -DHAVE_BROKEN_REALPATH to the Mac OS X (darwin) compile options
  this reportedly increases the stability under high load
include/Makefile.am:
  added my_getopt.h, rijndael.h, sha1.h, my_aes.h to resolve broken
  distribution dependencies

sql/slave.cc:
  Removed not used local variable

  comment fixed, bad flag hack removed


myisammrg/myrg_open.c:
  comment fixed, bad flag hack removed

sql/item_strfunc.cc:
  Fix type name typo

  semaphore fix


mit-pthreads/pthreads/semaphore.c:
  semaphore fix

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

Added SHA1() function, cleaned up MD5() info.
Added AES_ENCRYPT()/AES_DECRYPT() functions, cleaned up DES info.
Updated 4.0.2 changelog for above additions.
Clarified LAST_INSERT_ID(expr) info about sequences.
Fixed URL for Perl DBI.

Little language/grammar fixup.

client/mysql.cc:
  Fixes for MIT-pthreads
libmysqld/examples/Makefile.am:
  Fixes for MIT-pthreads
mit-pthreads/machdep/linux-2.0/__string.h:
  Fixes for MIT-pthreads
mysys/my_thr_init.c:
  Fixed spelling error.

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

system.

Docs/manual.texi:
  Auto merged

Added semaphore support to MIT-pthreads.


Docs/manual.texi:
  Updated benchmark data
configure.in:
  Portability fix for compiling MIT-pthreads with gcc 3.0.x
  (Still not perfect)
include/my_semaphore.h:
  Cleanup
mit-pthreads/Changes-mysql:
  Added semaphore support
mit-pthreads/include/Makefile.inc:
  Added semaphore support
mit-pthreads/include/pthread/ac-types.h:
  Added semaphore support
mit-pthreads/pthreads/GNUmakefile.inc:
  Added semaphore support
mit-pthreads/pthreads/Makefile.inc:
  Added semaphore support
mit-pthreads/stdio/xprintf.c:
  Added semaphore support
mysql-test/r/rpl_alter.result:
  Fixed test results after merge with 3.23
sql/ha_isam.cc:
  Fixed core dump after merge
sql/ha_isam.h:
  Fixed core dump after merge
sql/mini_client.cc:
  P

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