into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt

into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt

into  chilla.local:/home/mydev/mysql-4.1-bug14400

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt

            "concurrent insert"
After merge fix.

into  moonbone.local:/work/21677-bug-4.1-opt-mysql

  Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

  Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
query_cache.result:
  Corrected a test case after removing a fix for bug#16377

into  chilla.local:/home/mydev/mysql-4.1-bug14400

 VALUES() was considered a constant. This caused replacing 
 (or pre-calculating) it using uninitialized values before the actual
 execution takes place.
 Mark it as a non-constant (still not dependent of tables) to prevent
 the pre-calculation.

  Corrected test case after removal of fix for bug#16377         
type_date.test:
  Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
  Removed changes to the agg_cmp_type() made in the for bug#16377

into  chilla.local:/home/mydev/mysql-4.1-bug14400

            "concurrent insert"
Additional fix for full keys and test case.

into  rakia.(none):/home/kgeorge/mysql/autopush/B16792-4.1-opt

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

into  rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt

            1003: Incorrect table name
in multi-table DELETE the set of tables to delete from actually 
references then tables in the other list, e.g:
DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
is a valid statement.
So we must turn off table name syntactical validity check for alias_of_t1 
because it's not a table name (even if it looks like one).
In order to do that we add a special flag (TL_OPTION_ALIAS) to 
disable the name checking for the aliases in multi-table DELETE.

Fix an error in the bug fix.

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

  fix deadlock if master switches log file in parallell with "show master logs"
  

into  lamia.home:/home/timka/mysql/src/4.1-bug-21787

  
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.

 - Dont test "encrypt" in ctype_ucs

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

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  rama.(none):/home/jimw/my/mysql-4.1-21288

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

single file is a bad practice.  

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053

	event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41

Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte

into  chilla.local:/home/mydev/mysql-4.1-bug14400