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

innobase/buf/buf0flu.c:
  Testing if the file is ok in Bitkeeper

trx0sys.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0mysql.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0purge.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0sel.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0uins.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0umod.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0upd.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0start.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
sync0arr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
fil0fil.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ibuf0ibuf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
lock0lock.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
os0file.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0btr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0sea.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0sys.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ha_innobase.cc	Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints


sql/ha_innobase.cc:
  Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints
innobase/include/btr0cur.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/buf0buf.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/data0data.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/srv0srv.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0sys.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0trx.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0btr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0cur.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0sea.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/buf/buf0buf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/data/data0data.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/fil/fil0fil.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/ibuf/ibuf0ibuf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/lock/lock0lock.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/os/os0file.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0mysql.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0purge.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0sel.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0uins.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0umod.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0upd.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0srv.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0start.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/sync/sync0arr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0roll.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0sys.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0trx.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Changelog and more documentation about ALTER TABLE
include/mysqld_error.h:
  New error message
mysql-test/t/merge.test:
  Test of error conditions
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_myisammrg.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New message
sql/share/danish/errmsg.txt:
  New message
sql/share/dutch/errmsg.txt:
  New message
sql/share/english/errmsg.txt:
  New message
sql/share/estonian/errmsg.txt:
  New message
sql/share/french/errmsg.txt:
  New message
sql/share/german/errmsg.txt:
  New message
sql/share/greek/errmsg.txt:
  New message
sql/share/hungarian/errmsg.txt:
  New message
sql/share/italian/errmsg.txt:
  New message
sql/share/japanese/errmsg.txt:
  New message
sql/share/korean/errmsg.txt:
  New message
sql/share/norwegian-ny/errmsg.txt:
  New message
sql/share/norwegian/errmsg.txt:
  New message
sql/share/polish/errmsg.txt:
  New message
sql/share/portuguese/errmsg.txt:
  New message
sql/share/romanian/errmsg.txt:
  New message
sql/share/russian/errmsg.txt:
  New message
sql/share/slovak/errmsg.txt:
  New message
sql/share/spanish/errmsg.txt:
  New message
sql/share/swedish/errmsg.txt:
  New message

sql/ha_innobase.cc:
  SCCS merged

sql/ha_innobase.cc:
  Fix a bug in connection with SET INSERT_ID:caused repliaction to fail

to work automatically.  Thanks to Boyd Lynn Gerber for the patch.

Fix for lower case filenames


BitKeeper/deleted/.del-select.tst~2e626fa07144d2c8:
  Delete: mysql-test/misc/select.tst
Docs/manual.texi:
  Better examples for sub selects
bdb/lock/lock_region.c:
  Fixed not critical error
mysql-test/r/gemini.result:
  Testcase for load data infile
mysql-test/t/gemini.test:
  Testcase for load data infile
sql/sql_load.cc:
  Fixed that LOAD DATA INFILE works with transactions
sql/sql_show.cc:
  Fix for lower case filenames
sql/sql_string.cc:
  cleanup

Some small speedups


Docs/manual.texi:
  Changelog
client/mysqldump.c:
  Fixed quoting problem for table names when using --opt
mysys/mf_casecnv.c:
  Speed up some common string functions
sql-bench/test-insert.sh:
  Small changes that shouldn't affect results
sql-bench/test-select.sh:
  Small changes that shouldn't affect results
sql/field.h:
  Added reset() functions to speed up some common things
sql/gen_lex_hash.cc:
  Smaller hash table
sql/ha_innobase.cc:
  Fixed bug in auto-increment handling with InnoDB

forced by the user


mysql-test/r/innodb.result:
  updated result
mysql-test/t/innodb.test:
  added test case for bug in Innodb reported by Slashdot

into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Small changes because of user request.
heap/heapdef.h:
  Portability fix
include/global.h:
  Portability fix
myisam/myisamlog.c:
  Portability fix
sql/mini_client.cc:
  Fix for windows
sql/sql_repl.cc:
  Fix for windows
sql/violite.c:
  Fix for windows

Docs/Makefile.am:
  Added target for mysql.xml.

client/mysqlbinlog.cc:
  Auto merged

extern "C" {


client/mysqlbinlog.cc:
  #include <my_pthread.h>
include/my_pthread.h:
  #ifdef _cplusplus
  extern "C" {
  #endif

BUILD/compile-solaris-sparc-purify:
  Added -g

into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

clean up PostgreSQL section

client/mysqlbinlog.cc:
  SCCS merged
client/mysqltest.c:
  SCCS merged
include/my_pthread.h:
  SCCS merged