sql/item_func.cc:
  Removing unreferenced local variable

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())

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

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

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

myisam/myisamchk.c:
  typo fixed

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

Docs/manual.texi:
  fix agreement

include/my_pthread.h:
  Auto merged

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

include/myisam.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged

Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names


Build-tools/Do-compile:
  Added option --make-options
Docs/manual.texi:
  Changelog
  Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
  Update for running gcc 3.x on HPUX
client/mysql.cc:
  Portability fix
client/mysqlbinlog.cc:
  Fix for using gcc 3.1
configure.in:
  Fix for using gcc 3.1
include/my_global.h:
  Fix for using gcc 3.1
include/my_pthread.h:
  Removed warning on HPUX
innobase/configure.in:
  Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
  Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
  Test of new functions
mysql-test/r/rpl_get_lock.result:
  Test of new functions
mysql-test/t/func_test.test:
  Test of new functions
mysql-test/t/rpl_get_lock.test:
  Test of new functions
mysys/my_tempnam.c:
  Portability fix
sql/item_cmpfunc.cc:
  Added comments to Item_cond_xor.
  Fixed NULL handling for XOR
sql/item_create.cc:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
  Cleanup XOR handling
sql/item_func.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
  Moved chroot() to be exectued earlier.
sql/sql_db.cc:
  Apply lower_case_table_names also to databases
sql/sql_parse.cc:
  Apply lower_case_table_names also to databases
sql/sql_select.cc:
  Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
  Don't allow \ in database names

added -H (--HELP) to myisamchk to get a list of all the options it accepts (including debug and internal ones).

include/my_sys.h:
  make [un]lock_io_cache functions, not macro
  some io_cache_share functions int->void
include/myisam.h:
  mi_repair_by_sort_r -> mi_repair_parallel
  MI_SORT_PARAM.master field for updating info->s.state struct
myisam/mi_check.c:
  mi_repair_by_sort_r -> mi_repair_parallel
  MI_SORT_PARAM.master field for updating info->s.state struct
myisam/sort.c:
  my_thread_init()/my_thread_end()
  misc bugfixes
mysys/mf_iocache.c:
  io_cache_share functions int->void
  comments added
  [un]lock_io_cache functions added

include/my_pthread.h:
  small bug in #define
sql/sql_handler.cc:
  bug in order of #includes