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

mysys/mf_iocache.c:
  remove debug output

myisam/mi_close.c:
  yet another generalization for rec_buff handling
myisam/mi_dynrec.c:
  yet another generalization for rec_buff handling
myisam/mi_extra.c:
  yet another generalization for rec_buff handling
myisam/mi_open.c:
  yet another generalization for rec_buff handling
myisam/myisamdef.h:
  yet another generalization for rec_buff handling

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

  Simplify my.cnf example for InnoDB


Docs/manual.texi:
  Simplify my.cnf example for InnoDB

  Update manual, add the new simplified my.cnf example


Docs/manual.texi:
  Update manual, add the new simplified my.cnf example

Shuffled lines for easier reading.
Added missing SQL line.

into mysql.com:/home/zak/Work/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added note on how to determine thread cache efficiency.
  
  Added information on the behavior of the UNION clause

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new


mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into mysql.com:/home/zak/Work/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Expanded and corrected information on case-insensitive string comparison. 
  
  Fixed spelling mistake and lanuage usage in query cache information.
  
  Expanded query cache information by noting that the query cache is flushed 
  when table data changes.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/item_func.cc:
  Removing unreferenced local variable

myisam/mi_extra.c:
  make use of new mi_fix_rec_buff_for_blob(), and fix a (possible) bug
myisam/mi_open.c:
  make use of new mi_fix_rec_buff_for_blob()

mysys/array.c:
  Rewrite functions comments
mysys/checksum.c:
  Rewrite function comment
  Style cleanup
mysys/mulalloc.c:
  Rewrite function comment
mysys/my_chsize.c:
  Rewrite function comment
mysys/my_error.c:
  Rewrite comments
mysys/my_once.c:
  Rewrite comments
mysys/my_div.c:
  Rewrite comments
mysys/my_open.c:
  Rewrite comments

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


Docs/manual.texi:
  Auto merged

Examples reformatted in same section.

  Remove outdated sentence about online backup


Docs/manual.texi:
  Remove outdated sentence about online backup

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Add missing privilege to 4.0.2 change notes.

Corrected some comments that were using C++-style instead of C-style 


include/my_sys.h:
  Portability fix: define alloca as a compiler builtin on systems that have
  gcc but no alloca.h (e.g. some IBM AIX flavors), use "#pragma alloca" for
  IBMs compiler (xlc)
mysys/my_getopt.c:
  Replace C++-style comments with C-style comments
strings/ctype-latin1_de.c:
  Replace C++-style comments with C-style comments
strings/ctype-tis620.c:
  Replace C++-style comments with C-style comments

  4.0 creates an auto-extending 10 MB data file by default


Docs/manual.texi:
  4.0 creates an auto-extending 10 MB data file by default

  Clarify the meaning of innodb_data_home_dir and innodb_data_file_path in the manual


Docs/manual.texi:
  Clarify the meaning of innodb_data_home_dir and innodb_data_file_path in the manual

server-cfg.sh	add transactional for bdb


sql-bench/server-cfg.sh:
  Remove smds, remove coversaton from date to int for mysql,
  add transactional for bdb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Don't free memory from InnoDB at exit (as this may be done before other threads are finnished)


include/my_pthread.h:
  Added missing prototypes
innobase/srv/srv0start.c:
  Don't free memory at exit (as this may be done before other threads are finnished)
mysys/mf_iocache.c:
  Cleanup (Don't rely on return value from mutex_unlock())

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new


mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

myisam/mi_check.c:
  Auto merged

myisam/mi_check.c:
  Clear memory after keys to avoid warnings when using purify.
  (The keys will be written to file, so they are kind of used).
mysql-test/r/myisam.result:
  Check repaired table
mysql-test/t/myisam.test:
  Check repaired table