mysql-test/mysql-test-run.sh:
  Safety fix

Fix problem with query cache and database names


mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/query_cache.result:
  More tests when using different databases
mysql-test/t/query_cache.test:
  More tests when using different databases
sql-bench/test-wisconsin.sh:
  Portability fix
sql/sql_cache.cc:
  Fix problem with query cache and database names
sql/sql_parse.cc:
  Remove pre and end space in query.
sql/sql_table.cc:
  Limit created keys to MAX_KEY_LENGTH.

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

Docs/manual.texi:
  FreeBSD and News entries updated

into hundin.mysql.fi:/my/bk/mysql-4.0


sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged

mysql-test/r/innodb.result:
  Test that handler doesn't work with InnoDB
mysql-test/t/innodb.test:
  Test that handler doesn't work with InnoDB

Docs/manual.texi:
  Auto merged

Change tests to use database 'mysqltest' instead of 'foo'
Add option to not print access denied messages to check_table_access()


Docs/manual.texi:
  Updated query cache information.
client/mysqltest.c:
  When connection to the database '*NO-ONE*, connect without specify a database.
include/raid.h:
  Portability fix
mysql-test/r/drop.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/flush.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/innodb.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/query_cache.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/drop.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/flush.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/innodb.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/query_cache.test:
  Change test to use database 'mysqltest' instead of 'foo'
sql/mysql_priv.h:
  Add option to not print access denied messages
sql/net_pkg.cc:
  Fix for query cache
sql/net_serv.cc:
  Speed improvment
sql/sql_cache.cc:
  Fixed access privilege bug in query cache
sql/sql_cache.h:
  Always compiled with integrity check function prototypes.
sql/sql_do.cc:
  Removed warning
sql/sql_parse.cc:
  Add option to not print access denied messages

  Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value


sql/ha_innobase.h:
  Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value

  Make sure no memory overrun of key buffer in range estimation


sql/ha_innobase.cc:
  Make sure no memory overrun of key buffer in range estimation

  Update OLEDB section


Docs/manual.texi:
  Update OLEDB section

BitKeeper/etc/ignore:
  auto-union
sql/sql_handler.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged

HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT


sql/ha_berkeley.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_heap.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_innobase.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_isam.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_isammrg.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_myisammrg.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/sql_handler.cc:
  HANDLER works only with MyISAM tables
sql/sql_table.cc:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT

Docs/manual.texi:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/mysqld.cc:
  Use local version.

Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.


Docs/manual.texi:
  Update binary log reference
client/mysql.cc:
  Removed warning
include/thr_alarm.h:
  Cleanup of alarm macros.
libmysql/libmysql.c:
  Portabiliy fix
libmysql/net.c:
  Cleanup of alarm macros.
mysql-test/t/rpl_get_lock.test:
  Fixed results after merge.
mysys/my_bitmap.c:
  Removed warning.
sql/log_event.cc:
  Use thd->db_length
sql/mini_client.cc:
  Cleanup of alarm macros.
sql/net_serv.cc:
  Cleanup of alarm macros.
sql/sql_acl.cc:
  Use thd->db_length
sql/sql_cache.cc:
  Store used database together with the query.
sql/sql_class.cc:
  Use thd->db_length
sql/sql_class.h:
  Use thd->db_length
sql/sql_db.cc:
  Use thd->db_length
sql/sql_parse.cc:
  Use thd->db_length
sql/sql_udf.cc:
  Use thd->db_length

Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  Update results after InnoDB optimizer changes.

  Allow equal key values in a unique secondary index if the key value contains an SQL NULL


innobase/row/row0ins.c:
  Allow equal key values in a unique secondary index if the key value contains an SQL NULL

manual updated


Docs/manual.texi:
  mysqldump, News, Upgrading entires updated
client/mysqldump.c:
  "ALTER TABLE ... DISABLE KEYS" is added to the dump.
  Invisible spaces deleted :-)

  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally


innobase/log/log0recv.c:
  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally

mysql-test/t/rpl_get_lock.test:
  Auto merged
sql/ha_innobase.cc:
  Merge
sql/sql_parse.cc:
  Clean up comments

Fix pthread_mutex_trylock on HPUX (needed for query cache).


include/my_pthread.h:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
mysql-test/mysql-test-run.sh:
  Wait for .pid file instead of .sock, because .pid is created later.
mysql-test/r/query_cache.result:
  Test insert delated + query cache
mysql-test/t/query_cache.test:
  Test insert delated + query cache
mysys/my_pthread.c:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
sql/repl_failsafe.cc:
  Safety
sql/sql_insert.cc:
  Fix insert delated + query cache

Added info about two new Query Cache status variables.

tests/mail_to_db.pl:
  Fixed a bug in mail_to_db.pl; the program got confused by carriage
  return, if existed at the end of a line.

BitKeeper/etc/ignore:
  Added scripts/mysql_fix_extensions to the ignore list
scripts/mysql_fix_extensions.sh:
  typo fixed

Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Changed 'send_file_to_server' to use less stack (Fixed some problems in threaded applications)
mysql-test/mysql-test-run.sh:
  Fixed --sleep option
sql/mini_client.cc:
  Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
sql/mysqld.cc:
  Destroy query cache properly
sql/sql_cache.cc:
  Fixed bug in FLUSH QUERY CACHE

instead of DO RELEASE_LOCK()


mysql-test/t/rpl_get_lock.test:
  test for SELECT RELEASE() replication bug

  Add better instructions on how to specify innodb_data_file_path etc.


sql/ha_innobase.cc:
  Add better instructions on how to specify innodb_data_file_path etc.

Portability fixes.
Fixed bug in mysqlbinlog when detecting binary log version


client/mysqlbinlog.cc:
  Fixed bug when detecting binary log version
configure.in:
  Portability fix for HPUX
mysql-test/mysql-test-run.sh:
  Portability fix
sql-bench/bench-init.pl.sh:
  Updated benchmarks
sql-bench/run-all-tests.sh:
  Updated benchmarks
sql-bench/server-cfg.sh:
  Updated benchmarks
sql-bench/test-ATIS.sh:
  Updated benchmarks
sql-bench/test-connect.sh:
  Updated benchmarks

mysql-test/mysql-test-run.sh:
  Increased sleep times

BitKeeper/etc/ignore:
  Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
  Fix for purify
libmysql/Makefile.shared:
  Fix for purify
libmysqld/Makefile.am:
  Fix for purify
sql/sql_handler.cc:
  Cleanup

innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/Makefile.am:
  merge
sql/mysql_priv.h:
  merge
sql/sql_lex.h:
  merge
sql/sql_yacc.yy:
  merge