after merge fix
sql/mysqld.cc
    too early for sync-binlog=1 by default :)

fix a race condition in TC_LOG_BINLOG::unlog

   restore original 'lex->query_tables' table list after
   processing of information schema table
   remove unnecessary operations

into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0

    the fix for 'columns' table only
    Rights check for 'routines' table is already done
    (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
    rename 'testtets' database to 'mysqltest' to keep number of
      DBs which created by mysql-test as small as possible

into mysql.com:/usr/home/ram/work/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

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

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

Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)

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

Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907)

into mysql.com:/home/jimw/my/mysql-4.1-clean

server testing cleanups.

  Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer

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

  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

into mysql.com:/home/jimw/my/mysql-4.1-clean

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

Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates

into mysql.com:/usr/home/bar/mysql-5.0

  fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.

we have to handle bit fields as well.

into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344

Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)

minor cleanups
XA tests

into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-trg3

into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0

%s instead of table names".

Propagating changes from old language-specific errmsg.txt files to new
global errmsg.txt.

when using --new" into 4.1 tree.