Note: bug#21726 does not directly apply to 4.1, as it doesn't have stored
procedures.  However, 4.1 had some bugs that were fixed in 5.0 by the
patch for bug#21726, and this patch is a backport of those fixes.
Namely, in 4.1 it fixes:

  - LAST_INSERT_ID(expr) didn't return value of expr (4.1 specific).

  - LAST_INSERT_ID() could return the value generated by current
    statement if the call happens after the generation, like in

      CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY, j INT);
      INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID());

  - Redundant binary log LAST_INSERT_ID_EVENTs could be generated.

create_tmp_table()".

The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
result" introduced valgrind warnings which occured during execution
of information_schema.test and sp-prelocking.test in version 5.0.
There were no user visible effects.

The latter fix made create_tmp_table() dependant on
THD::lex::current_select value. Valgrind warnings occured when this
function was executed and THD::lex::current_select member pointed
to uninitialized SELECT_LEX instance.

This fix tries to remove this dependancy by moving some logic
outside of create_tmp_table() function.

into  mockturtle.local:/home/dlenev/src/mysql-4.1-runtime

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

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

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

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

            "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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

 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