mysql-test/mysql-test-run.sh:
  Added more informative error message

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Splitted INSERT syntax to different sub-sections
mysql-test/r/delayed.result:
  Added new test that hanged INSERT DELAYED
mysql-test/t/delayed.test:
  Added new test that hanged INSERT DELAYED
scripts/mysqldumpslow.sh:
  Fix for new slow query log format
sql/field_conv.cc:
  cleanup

configure.in:
  Always make a dummy bdb/build_unix/db.h, because the
  dependencies are included in the Makefile, which gets
  distributed, so this file has to exist.  This is ugly.

'make distcheck' will work.  I hope.

This is an ugly hack....


configure.in:
  Force a fake bdb/build_unix/db.h file in case
  we're doing a VPATH build and using dependency
  files from an older build.  This happens when
  'make distcheck' is run.

Docs/manual.texi:
  Note about DROP DATABASE and Innobase website to the manual

innobase/row/row0mysql.c:
  Innobase does not trap now if one creates a table already in Innobase

Updated manual about INNOBASE and BDB


BUILD/SETUP.sh:
  Added --print as alias for --just-print
BUILD/compile-pentium-debug:
  Changed --with-innobase-db to --with-innobase
BUILD/compile-pentium:
  Changed --with-innobase-db to --with-innobase
Build-tools/Do-all-build-steps:
  Changed --with-innobase-db to --with-innobase
Docs/manual.texi:
  Added that BDB and INNBASE is included in the source distribution
sql/mysqld.cc:
  Fixed typo
support-files/maxsql.spec.sh:
  Changed --with-innobase-db to --with-innobase
support-files/mysql.spec.sh:
  Changed --with-innobase-db to --with-innobase

into threads.polyesthetic.msg:/usr/local/src/my/work

Docs/manual.texi:
  Auto merged

into evoq.mwagner.org:/opt/local/x1/work/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added entry to contrib section.

Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.


Docs/manual.texi:
  Update for innobase
mysql-test/r/innobase.result:
  Fixed test cases
mysql-test/t/bdb.test:
  Removed not used tables
mysql-test/t/innobase.test:
  Fixed test cases
sql/field.h:
  Fixed bug introduced with last ORDER BY optimization
sql/ha_berkeley.cc:
  Fixed bug when index_init() was called twice.
sql/mysql_priv.h:
  Added option to not get stack trace (when using gdb)
sql/mysqld.cc:
  Added option to not get stack trace (when using gdb)
sql/slave.cc:
  Changed log position to longlong to avoid warnings.
sql/slave.h:
  Changed log position to longlong to avoid warnings.
sql/sql_parse.cc:
  Removed warnings
sql/sql_select.cc:
  Cleanups

Build-tools/Do-all-build-steps:
  We build with BerkeleyDB now, too.

into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged

Build-tools/Do-all-build-steps:
  We now build with Berkeley DB.
Docs/manual.texi:
  Try to make MySQL's extensions to GROUP BY more noticable.
acinclude.m4:
  Berkeley DB defaults to "no", now.
  
  Changes so that 'make distcheck' works with Berkeley DB.
bdb/Makefile.in:
  Add some more dummy targets to ignore.

innobase/mem/mem0pool.c:
  Removed excessive out of mem warnings

ha_innobase.cc	Fix a bug in removal of trailing spaces of binary varchar strings, fix a bug in REPLACE


sql/ha_innobase.cc:
  Fix a bug in removal of trailing spaces of binary varchar strings, fix a bug in REPLACE

row0upd.c	Fix REPLACE problem, non-latin1 charset bug
rem0cmp.c	Fix REPLACE problem, non-latin1 charset bug


innobase/rem/rem0cmp.c:
  Fix REPLACE problem, non-latin1 charset bug
innobase/row/row0mysql.c:
  Fix REPLACE problem, non-latin1 charset bug
innobase/row/row0upd.c:
  Fix REPLACE problem, non-latin1 charset bug

tables.
Merged maxsql.spec with mysql.spec


mysql-test/r/innobase.result:
  Almost up to date test results
mysql-test/t/innobase.test:
  Added testing of error codes
sql-bench/test-insert.sh:
  Added testing of key-only-read
sql/ha_berkeley.cc:
  Added DBUG_PRINT
sql/sql_select.cc:
  Removed duplicated index_init() calls
support-files/maxsql.spec.sh:
  Merge with mysql.spec.  Take into account that BDB and Innobase is
  in the MySQL source tree
support-files/mysql.spec.sh:
  Removed usage of innobase in standard RPM

sql/ha_innobase.cc:
  Auto merged

Print full command name to log files
Convert table type to supported onces on ALTER TABLE


Docs/manual.texi:
  Updates from user comments
bdb/log/log_rec.c:
  Patch from sleepycat to fix problem with log files
innobase/ibuf/Makefile.am:
  Don't let make do bk get
innobase/include/Makefile.am:
  Don't let make do bk get
man/Makefile.am:
  Don't let make do bk get
myisam/mi_dbug.c:
  Print warning to debug log
mysql-test/mysql-test-run.sh:
  Don't use innobase in replica
mysql-test/r/null_key.result:
  Fix for new key lengths
sql/ha_innobase.cc:
  Free hash cache at end
sql/log.cc:
  Print full command name to log files
sql/sql_table.cc:
  Convert table type to supported onces on ALTER TABLE

trx0trx.h	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0ins.c	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0mysql.c	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0mysql.h	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
ha_innobase.cc	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs


sql/ha_innobase.cc:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/include/row0mysql.h:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/include/trx0trx.h:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/row/row0ins.c:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/row/row0mysql.c:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs

Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.


Docs/manual.texi:
  Added some examples and moved the Error access denied section to the
  error section.
client/mysqltest.c:
  Changed to use the new mysql_send_query()
include/mysql.h:
  Changed mysql_reap_query() to mysql_send_query().
libmysql/libmysql.c:
  Changed mysql_reap_query() to mysql_send_query()
  Merged some functions and removed some unused functions.
mysql-test/r/bdb.result:
  New test case
mysql-test/r/distinct.result:
  New test case
mysql-test/r/key.result:
  New test case
mysql-test/r/merge.result:
  New test case
mysql-test/r/replace.result:
  New test case
mysql-test/t/bdb.test:
  New test case
mysql-test/t/key.test:
  New test case
mysql-test/t/merge.test:
  New test case
mysql-test/t/replace.test:
  New test case
mysys/my_lock.c:
  Moved global lock variable to static
sql-bench/test-insert.sh:
  Added test case for index-read only
sql/field.h:
  Fixed that one can optimize ORDER BY with ISAM and GEMINI
sql/ha_berkeley.cc:
  Added type casts needed for Windows
sql/ha_innobase.cc:
  Removed reference to manual from comment.
sql/ha_myisammrg.cc:
  Remember UNION for ALTER TABLE
sql/ha_myisammrg.h:
  Remember UNION for ALTER TABLE
sql/handler.cc:
  Added test for if we are supporting transactions.
  Don't allow REPLACE to replace a row when we have generated an auto_increment key.
sql/handler.h:
  Remember UNION for ALTER TABLE
sql/key.cc:
  Fixed bug when using BLOB keys
sql/mysql_priv.h:
  Added new variables
sql/mysqld.cc:
  Added new variables
sql/opt_range.cc:
  Fixed problem with BLOB keys
sql/opt_sum.cc:
  Fix for BLOB keys
sql/sql_class.cc:
  Added test if we need to init/clean transaction variables
sql/sql_insert.cc:
  Fix for REPLACE and auto_increment keys
sql/sql_parse.cc:
  Fixed bug in max_user_connections
sql/sql_select.cc:
  Fixed problem with key on BLOB
sql/sql_yacc.yy:
  Fixed bug in SET @variable=user.
sql/table.cc:
  Fixed problem with keys on BLOB

Clean up Do-all-build-steps.


Build-tools/Do-all-build-steps:
  Make this script run on machines other than mysql-work.
innobase/Makefile.am:
  Make sure ib_config.h is distributed.

innobase/configure.in:
  Add include/Makefile to AC_OUTPUT

be distributed properly.


innobase/Makefile.am:
  Added include to SUBDIRS

sql/sql_insert.cc:
  DELAYED INSERT bus error fixed

Build-tools/Do-all-build-steps:
  Innobase is included in the distribution.

into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  'Auto converge'

targets (like 'distdir') properly.


configure.in:
  BDB subdir is now 'bdb', not 'bdb/build_unix'.  Remove code that
  modifies the bdb/build_unix/Makefile, because it's no longer needed.

BitKeeper/triggers/post-commit:
  limit mail to 10,000 lines

BitKeeper/etc/ignore:
  added bdb/build_unix/*
BUILD/FINISH.sh:
  Run the s_all script in bdb/dist before running configure