the local tree contains a fix for 
Bug#32748 "Inconsistent handling of assignments to 
general_log_file/slow_query_log_file",
which changes output of a number of tests.

after PREPARE"
Update test results after a merge with the main tree: the new minimum for 
the table definition cache is 256.

 PREPARE", review fixes:
- make the patch follow the specification of WL#4166 and remove  
the new error that was originally introduced.
Now the client never gets an error from reprepare, unless it failed.
I.e. even if the statement at hand returns a completely different
result set, this is not considered a server error.
The C API library, that can not handle this situation, was modified to
return a client error.
Added additional test coverage.

into  bodhi.(none):/opt/local/work/mysql-5.1-27430

into  bodhi.(none):/opt/local/work/mysql-5.1-27430

PREPARE": rename members, methods, classes to follow the spec 
(a code review request)

Add test target to the makefile that will cause all
statements to be re-prepared before execution.

into  mysql.com:/d2/hf/mysql-5.1-bugteam

  rpl_innodb_bug28430 disabled

into  host.loc:/work/bk/5.1-bugteam

into  host.loc:/work/bk/5.0-bugteam

                 first row or fails with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''

The server uses intermediate temporary table to store updated
row data.  The first column of this table contains rowid.
Current server implementation doesn't reset NULL flag of that
column even if the server fills a column with rowid.
To keep each rowid unique, there is an unique index.
An insertion into an unique index takes into account NULL
flag of key value and ignores real data if NULL flag is set.
So, insertion of actually different rowids may lead to two
kind of problems.  Visible effect of each of these problems
depends on an initial engine type of temporary table:

1. If multiupdate initially creates temporary table as
a MyISAM table (a table contains blob columns, and the
create_tmp_table function assumes, that this table is
large), it inserts only one single row and updates
only rows with one corresponding rowid. Other rows are
silently ignored. 

2. If multiupdate initially creates MEMORY temporary
table, fills it with data and reaches size limit for
MEMORY tables (max_heap_table_size), multiupdate
converts MEMORY table into MyISAM table and fails
with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''


Multiupdate has been fixed to update the NULL flag of
temporary table rowid columns.

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam

(Bug#27430)

"Crash in subquery code when in PS and table DDL changed after PREPARE"

temporary variables of 'long' types were used to store ulong values,
that causes init_key_cache to receive distorted parameters

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-bugteam

  updated the testcase for bug 36011

into  magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/autopush/B36011-take2-5.0-bugteam

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

master also, so that we can visually see the slave is the same.

into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam

   with dependent subqueries
An IN subquery is executed on EXPLAIN when it's not correlated.
If the subquery required a temporary table for its execution
not all the internal structures were restored from pointing to
the items of the temporary table to point back to the items of
the subquery.
Fixed by restoring the ref array when a temp tables were used in
executing the IN subquery during EXPLAIN EXTENDED.

into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam

into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744

into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam

into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam

into  host.loc:/work/bk/5.0-bugteam

into  host.loc:/work/bk/5.1-bugteam