engine, except when running with sql_mode & MYSQL323. (Bug #6659)


mysql-test/r/create.result:
  Fix test results
mysql-test/r/ctype_utf8.result:
  Fix test results
mysql-test/r/information_schema.result:
  Fix results
mysql-test/r/show_check.result:
  Fix results
sql/ha_heap.h:
  Output 'HEAP' in MySQL 3.23 compatibility mode
mysql-test/r/heap.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results

sql/mysqld.cc:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-5.0-clean

into mysql.com:/home/jwinstead2/mysql-5.0-clean

into hundin.mysql.fi:/home/heikki/mysql-5.0

  Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation


innobase/row/row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
innobase/include/sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
sql/ha_innodb.cc:
  Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case

into mysql.com:/home/my/mysql-5.0

into mysql.com:/home/jwinstead2/mysql-5.0-clean


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-5.0.clean

into mysql.com:/home/kostja/work/mysql-4.1-root


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysys/default.c:
  silly mistake happened during the merge

case will be added to client_test in 4.1


sql/sql_parse.cc:
  A fix for bug #6761: "mysql_list_fields() does not work": init
  thd->query_length, which is used next line. Remove a stale comment.

into mysql.com:/home/my/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1-merge

into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged

  the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"

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


sql/mysqld.cc:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem

into mysql.com:/home/my/mysql-5.0


sql/opt_range.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-look-valgrind

 {min,max}_functions_it as it is not allocated on the pool.

mysql-test/t/ctype_eucjp_ms.test:
  uncommnented the drop table statement

config/ac-macros/character_sets.m4:
  added cp932, eucjp_ms character set
include/m_ctype.h:
  added cp932, eucjp_ms character set
libmysql/Makefile.shared:
  added cp932, eucjp_ms character set
mysys/charset-def.c:
  added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
  added cp932, eucjp_ms character set
strings/Makefile.am:
  added cp932, eucjp_ms character set

into mysql.com:/home/my/mysql-5.0


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

sql/ha_federated.cc:
  Change mode to -rw-rw-r--
myisam/mi_create.c:
  Ensure that all referenced memory is reset
mysql-test/r/type_timestamp.result:
  More tests
mysql-test/t/func_compress.test:
  Added comment
mysql-test/t/type_timestamp.test:
  More tests
sql/field.h:
  Count number of varchars in table
sql/item_cmpfunc.cc:
  Safety fix (to avoid warning from valgrind)
sql/opt_range.cc:
  Simple optimzation
sql/sql_acl.cc:
  Safety fix (to avoid warning from valgrind)
sql/sql_parse.cc:
  Safety fix for prepared statements
sql/sql_show.cc:
  Move variable declarations first in function
  Remove hidden variable (it)
  Remove accessing freed memory (table_list->table_name)
sql/sql_update.cc:
  Compare records with varchars correctly
sql/table.cc:
  Safety fix when running with purify/valgrind
  Fix wrong memory reference in case of errors
sql/table.h:
  Added counting of varchar fields
strings/ctype-mb.c:
  Fill max_str properly

  increased timeouts to see if more tests get started automatically


mysql-test/ndb/ndbcluster.sh:
  increased timeouts to see if more tests get started automatically

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

scripts/Makefile.am:
  Replace ZLIB_LIBS

  Clean-up for the previous change: VARCHAR and trailing spaces.


mysql-test/t/strict.test:
  Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
  Clean-up for the previous change: VARCHAR and trailing spaces.

into deer.(none):/home/hf/work/mysql-5.0.clean

VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging