Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added more information to MySQL comparison

  Fix danish mirror contact


Docs/manual.texi:
  Fix danish mirror contact

Docs/manual.texi:
  Added description of C thread functions
sql-bench/test-create.sh:
  Faster --fast option

sql/handler.cc:
  Change the parameter name of default-table-type from INNOBASE to INNODB

libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix

data0data.c	Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened


innobase/data/data0data.c:
  Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened

trx0trx.h	Fix slowness of deadlock detection algorithm


innobase/include/trx0trx.h:
  Fix slowness of deadlock detection algorithm
innobase/lock/lock0lock.c:
  Fix slowness of deadlock detection algorithm

  Fix a couple of mirror e-mail addresses


Docs/manual.texi:
  Fix a couple of mirror e-mail addresses

include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Fix problem with MyISAM and rows of length 65517-65520


Docs/manual.texi:
  Changelog
include/raid.h:
  Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
  Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
  Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
  Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
  Test for myisam tables with problematic row lengths
sql/log_event.cc:
  Portability fix
strings/ctype-euc_kr.c:
  Portability fix
strings/ctype-sjis.c:
  Portability fix

fields (inf,nan,...); should be dumped as "NULL".

Docs/manual.texi:
  Small changes for INNER JOIN
configure.in:
  Use 'mysql' as the default MySQL user
myisam/mi_create.c:
  Test for right create information

sql-bench/test-insert.sh:
  Change IN() test to use LEFT JOIN to be comparable to IN()

Portability fixes


Build-tools/Do-compile:
  Fix for Linux ia64
sql-bench/bench-init.pl.sh:
  Added help function time_fetch_all_rows
sql-bench/test-insert.sh:
  Added testing of IN(value-list)
sql/item_func.cc:
  Cleanup
sql/mysqld.cc:
  Portability fix
sql/stacktrace.c:
  Portability fix

sql/item_func.cc:
  Auto merged

Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fix problem with INSERT DELAYED during shutdown

into mysql.sashanet.com:/home/sasha/src/bk/mysql

sql/item_func.cc:
  log all lock releases to binary log for safe handling of get_lock()
  in updates

        Add #undef inline to all C++ tests.
        This is needed to work with some C++ compilers....


configure.in:
  Add #undef inline to all C++ tests.
  This is needed to work with some C++ compilers....

Make killing threads safer


Docs/manual.texi:
  Portability fix
mysys/thr_lock.c:
  Fixed problem with INSERT DELAYED
sql/mysqld.cc:
  Make shutdown safer
sql/sql_class.cc:
  Make kill thread safer
sql/sql_insert.cc:
  Make kill thread safer

ha_innobase.h	Remove HA_NOT_READ_AFTER_KEY from table han
ha_innobase.h	dler flags: it prevented the use of an index in MAX()


sql/ha_innobase.h:
  Remove HA_NOT_READ_AFTER_KEY from table han
  dler flags: it prevented the use of an index in MAX()
sql/ha_innobase.cc:
  Add better error message if innodb_data_file_path is not set

Build-tools/Do-compile:
  Fix compilition for computer in a previous timezone
sql/net_serv.cc:
  Added comment
sql/sql_parse.cc:
  Cleanup

Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Portability fix
myisam/ft_test1.c:
  Portability fix
sql/log_event.cc:
  Portability fix

configure.in:
  Auto merged

sql/ha_myisam.cc:
  Added comments

myisam/myisamchk.c:
  Fixes bug when not using --set-character-set
myisam/myisampack.c:
  Fixed problem with blobs

Docs/manual.texi:
  Changelog

dbug/dbug.c:
  Portability fix
include/heap.h:
  Portability fix
strings/conf_to_src.c:
  Portability fix

manual.texi	fix age calculations in the tutorial section to
manual.texi	determine age in integer years and to account for
manual.texi	relative order of dates within calendar year.


Docs/manual.texi:
  minor change log fixes

Docs/manual.texi:
  Cleanup