myisam/mi_check.c:
  cleanups

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

mysql-test/r/order_by.result:
  Added new test
mysql-test/t/order_by.test:
  Added new test

Docs/manual.texi:
  Auto merged

Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables


Docs/manual.texi:
  Changelog
VC++Files/bdb/bdb.dsp:
  Updated project files for 4.0.4
VC++Files/client/mysqlclient.dsp:
  Updated project files for 4.0.4
VC++Files/innobase/innobase.dsp:
  Updated project files for 4.0.4
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated project files for 4.0.4
VC++Files/mysys/mysys.dsp:
  Updated project files for 4.0.4
VC++Files/perror/perror.dsp:
  Updated project files for 4.0.4
VC++Files/sql/mysqld.dsp:
  Updated project files for 4.0.4
client/mysqldump.c:
  Only write short usage if one starts mysqldump without any options
include/config-win.h:
  Added query cache on windows
libmysql/libmysql.def:
  Removed old depricated functions from windows dll
sql/ha_innodb.cc:
  Added missing defines
sql/set_var.cc:
  Code cleanup
sql/sql_acl.cc:
  Added error message if one can't read privilege tables
sql/sql_cache.h:
  Changed some C linkage functions to C++ functions (portability fix)
sql/sql_class.cc:
  Safety fix

Docs/manual.texi:
  FULLTEXT works with CHAR, too.

   "--gcov" is actually passed as a command line option (to avoid
   failures on systems with no gcov installed)


mysql-test/mysql-test-run.sh:
   - only probe for gcov, if it's actually required

into build.mysql2.com:/home/serg/mysql-4.0

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_yacc.yy:
  merged

  static nss linkingg issue


configure.in:
  static nss linkingg issue
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/rpl_flush_log_loop.result:
  Made results independent of MASTER_PORT and SLAVE_PORT
mysql-test/t/rpl_flush_log_loop.test:
  Made results independent of MASTER_PORT and SLAVE_PORT

configure.in:
   - Added missing line from 4.0 patch for static glibc linking

configure.in:
   - Fixed bug in previous patch for linking against libc (taken from 4.0)

Docs/manual.texi:
  Auto merged

SET PASSWORD=... closed connection on error.


Docs/manual.texi:
  Changelog
mysql-test/r/rpl_rotate_logs.result:
  Fixed test
scripts/mysql_fix_privilege_tables.sh:
  Don't give the anonymous user create temp table or lock tables privileges.
sql/set_var.cc:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
sql/set_var.h:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
sql/sql_acl.cc:
  Added function comment
sql/sql_db.cc:
  Change type of variable
sql/sql_parse.cc:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
tests/grant.pl:
  Updated grant test case to work with latest MySQL version
tests/grant.res:
  updated test results

Docs/manual.texi:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/sql_acl.cc:
  Merge with 3.23.53 (fixes problem with critical region in GRANT)
sql/sql_insert.cc:
  Merge with 3.23.53 (no changes)
sql/sql_parse.cc:
  Merge with 3.23.53 (no changes)
sql/sql_udf.cc:
  Merge with 3.23.53 (indent change)
sql/table.h:
  Merge with 3.23.53 (no changes)

client/mysql.cc:
  Fixed help text
mysql-test/t/rpl_rotate_logs.test:
  Updated test
sql/sql_acl.cc:
  comments and safety checks

into teton.kitebird.com:/home/paul/mysql-4.0

Docs/manual.texi:
  Fix typo in option name.

  Table hash key len in query cache also includes null char at end


sql/ha_innodb.cc:
  Table hash key len in query cache also includes null char at end
innobase/row/row0ins.c:
  Table hash key len in query cache also includes null char at end

Added missing mutex-lock around critical section in GRANT handling.


Docs/manual.texi:
  ChangeLog
sql/lock.cc:
  Change name -> alias in TABLE_LIST.
sql/slave.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_acl.cc:
  Added missing mutex-lock around critical section in GRANT handling.
  Changed name -> alias
sql/sql_base.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_insert.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_parse.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_show.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_table.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_udf.cc:
  Change name -> alias in TABLE_LIST.
sql/table.h:
  Change name -> alias in TABLE_LIST.
tests/grant.pl:
  Fixed grant test

  Fix a crash introduced when we grew foreign key comment to 16000 chars


innobase/dict/dict0dict.c:
  Fix a crash introduced when we grew foreign key comment to 16000 chars

  Add return statement


sql/ha_innodb.cc:
  Add return statement

  Fix typos in last push
  Fix typo


sql/ha_innodb.cc:
  Fix typos in last push

  Fix assertion when a temporary table is created and used inside LOCK TABLES


sql/ha_innodb.h:
  Fix assertion when a temporary table is created and used inside LOCK TABLES
sql/ha_innodb.cc:
  Fix assertion when a temporary table is created and used inside LOCK TABLES

manual.texi	LAST_INSERT_ID() usage.


Docs/manual.texi:
  fix capitalization, clarify context for
  LAST_INSERT_ID() usage.

   of the static_nss stuff required for linking against the patched
   glibc)


configure.in:
   - Applied some modifications from the 4.0 configure.in to fix some
     typos and platform-specific issues (Solaris 2.6, Mac OS 10.2)

Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
This should fix some issues where --lower-case-table-names doesn't work properly under windows.


client/mysql.cc:
  Added missing sslopt-case.h
sql/lock.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/log_event.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/mysqld.cc:
  Fixed that --ssl and --skip-ssl works
sql/slave.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_acl.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_base.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_cache.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_handler.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_insert.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_parse.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_show.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_table.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_udf.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_union.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_yacc.yy:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/table.h:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.

  Fix typo


innobase/srv/srv0srv.c:
  Fix typo

  Put back a change unintentionally removed in the last 2 pushes


innobase/row/row0mysql.c:
  Put back a change unintentionally removed in the last 2 pushes
innobase/srv/srv0srv.c:
  Put back a change unintentionally removed in the last 2 pushes
innobase/include/srv0srv.h:
  Put back a change unintentionally removed in the last 2 pushes