Additional changes from the following commits:

http://lists.mysql.com/commits/81279
http://lists.mysql.com/commits/81607

These were missed when scanning 'bzr log' for changes.

> ------------------------------------------------------------
> revno: 3092.1.2 [merge]
> revision-id: joro@sun.com-20090831134035-wndnw04gy8kzogpm
> parent: anurag.shekhar@sun.com-20090831075609-tkpqu41hxtupdeip
> parent: joro@sun.com-20090827114042-h55n7qp9990bl6ge
> committer: Georgi Kodinov <joro@sun.com>
> branch nick: B46749-5.1-bugteam
> timestamp: Mon 2009-08-31 16:40:35 +0300
> message:
>   automerge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

> ------------------------------------------------------------
> revno: 3085 [merge]
> revision-id: sergey.glukhov@sun.com-20090827105925-j56pdghdzb8nlw3p
> parent: alfranio.correia@sun.com-20090827093227-9exafl3k6362bvq7
> parent: sergey.glukhov@sun.com-20090827102219-sgjz0v5t1rfccs14
> committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Thu 2009-08-27 15:59:25 +0500
> message:
>   5.0-bugteam->5.1-bugteam merge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

> ------------------------------------------------------------
> revno: 3075
> revision-id: ramil@mysql.com-20090821055535-a5aeas33epokjjnp
> parent: joro@sun.com-20090820141122-gq6eyozybvar4o4s
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Fri 2009-08-21 10:55:35 +0500
> message:
>   Fix for bug #46456 [Ver->Prg]: HANDLER OPEN + TRUNCATE + DROP
>   (temporary) TABLE, crash
>   
>   Problem: if one has an open "HANDLER t1", further "TRUNCATE t1" 
>   doesn't close the handler and leaves handler table hash in an 
>   inconsistent state, that may lead to a server crash.
>   
>   Fix: TRUNCATE should implicitly close all open handlers.
>   
>   Doc. request: the fact should be described in the manual accordingly.

> ------------------------------------------------------------
> revno: 3068
> revision-id: ramil@mysql.com-20090813194928-3djdqvpock0pxhgp
> parent: li-bing.song@sun.com-20090813024857-1emgf5lhj0zikoj8
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Fri 2009-08-14 00:49:28 +0500
> message:
>   Fix for bug #46614: Assertion in show_create_trigger() 
>   on SHOW CREATE TRIGGER + MERGE table
>   
>   Problem: SHOW CREATE TRIGGER erroneously relies on fact
>   that we have the only underlying table for a trigger
>   (wrong for merge tables).
>   
>   Fix: remove erroneous assert().

> ------------------------------------------------------------
> revno: 3059 [merge]
> revision-id: martin.hansson@sun.com-20090810140851-aw5peehzdxi4gjja
> parent: iggy@mysql.com-20090806145453-ion37sfdsldwwjrj
> parent: martin.hansson@sun.com-20090807115140-7fn6wjx0mrui7zl5
> committer: Martin Hansson <martin.hansson@sun.com>
> branch nick: 5.1bt
> timestamp: Mon 2009-08-10 16:08:51 +0200
> message:
>   Merge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

> ------------------------------------------------------------
> revno: 3044.1.3
> revision-id: kristofer.pettersson@sun.com-20090729224404-hwevly1cbi7gojf0
> parent: kristofer.pettersson@sun.com-20090729202743-tp9ihd5xavq8eguw
> committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Thu 2009-07-30 00:44:04 +0200
> message:
>   Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
>   
>   Fixed wrong prototype declaration which cased build failure on solaris.

> ------------------------------------------------------------
> revno: 3044.1.1
> revision-id: kristofer.pettersson@sun.com-20090729200708-cb0td7n9r5md0aa0
> parent: davi.arnaut@sun.com-20090728195938-qabe9ldm2l4k8xns
> committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Wed 2009-07-29 22:07:08 +0200
> message:
>   Bug#44521 Executing a stored procedure as a prepared statement can sometimes cause
>             an assertion in a debug build.
>   
>   The reason is that the C API doesn't support multiple result sets for prepared
>   statements and attempting to execute a stored routine which returns multiple result
>   sets sometimes lead to a network error. The network error sets the diagnostic area
>   prematurely which later leads to the assert when an attempt is made to set a second
>   server state.
>   
>   This patch fixes the issue by changing the scope of the error code returned by
>   sp_instr_stmt::execute() to include any error which happened during the execution.
>   To assure that Diagnostic_area::is_sent really mean that the message was sent all
>   network related functions are checked for return status.

> ------------------------------------------------------------
> revno: 3028 [merge]
> revision-id: davi.arnaut@sun.com-20090715182250-ru0l00nqqlcfqe8n
> parent: ramil@mysql.com-20090715102544-ejid81yz8k39m2fa
> parent: kostja@sun.com-20090715170034-kjzpmq3px90pedw7
> committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
> branch nick: 44495-5.1
> timestamp: Wed 2009-07-15 15:22:50 -0300
> message:
>   Bug#44495: Prepared Statement: CALL p(<x>) - `thd->protocol == &thd->protocol_text' failed
>   
>   Merge Konstantin's patch and add a test case.
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

> ------------------------------------------------------------
> revno: 3027
> revision-id: ramil@mysql.com-20090715102544-ejid81yz8k39m2fa
> parent: anurag.shekhar@sun.com-20090715101345-6n3o8wf8woyaqlwc
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Wed 2009-07-15 15:25:44 +0500
> message:
>   Addition to #45998 fix, result adjusted.

> ------------------------------------------------------------
> revno: 3019.1.3
> revision-id: ramil@mysql.com-20090714150729-xqv7aicsnoz6epy6
> parent: jimw@mysql.com-20090713191116-c8qxsrjagzbvbytj
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: b45998-5.1-bugteam
> timestamp: Tue 2009-07-14 20:07:29 +0500
> message:
>   Fix for bug#45998: database crashes when running
>   "create as select" (innodb table)
>   
>   Problem: code constructing "CREATE TABLE..." statement
>   doesn't take into account that current database is not set
>   in some cases. That may lead to a server crash.
>   
>   Fix: check if current database is set.

> ------------------------------------------------------------
> revno: 2949.5.6
> revision-id: jperkin@sun.com-20090824091334-6ktgrhq218vl7zq1
> parent: joerg@mysql.com-20090821095644-12woawc4d2d3u7k4
> committer: Jonathan Perkin <jperkin@sun.com>
> branch nick: mysql-5.1-build
> timestamp: Mon 2009-08-24 10:13:34 +0100
> message:
>   Apply changes from mysql-5.1.38-release clone:
>   
>    - Add conditionals for bundled zlib and innodb plugin.
>    - Apply patch from bug#46834 to install the test suite in RPMs.
>    - Add plugins to RPMs.  Disable example plugins.

            mutually-nested subqueries

Queries of the form

  SELECT * FROM (SELECT 1) AS t1,
                (SELECT 2) AS t2,...
                (SELECT 32) AS t32

caused the "Too high level of nesting for select" error
as if the query has a form

  SELECT * FROM (SELECT 1 FROM (SELECT 2 FROM (SELECT 3 FROM...


The table_factor parser rule has been modified to adjust
the LEX::nest_level variable value after every derived table.

Remove commented-out test case. It has been moved to innodb_bug21704.test

  sort_buffer_size cannot allocate

The NULL return from tree_insert() (on low memory) was not
checked for in Item_func_group_concat::add(). As a result
on low memory conditions a crash happens.

Fixed by properly checking the return code.

1. BUG#21704 - Renaming column does not update FK definition

2. Changes in mysql-test/include/mtr_warnings.sql so that the testcase
   for BUG#21704 doesn't fail because of the warnings generated.

Detailed revision comments:

r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
branches/5.1:

Fix Bug#21704 Renaming column does not update FK definition

by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.

The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.

            and base tables 

myrg_attach_children() could reuse a buffer that was allocated 
previously based on a definition of a child table. The problem 
was that the child's definition might have been changed, so 
reusing the buffer could lead to crashes or valgrind errors 
under some circumstances. 
 
Fixed by changing myrg_attach_children() so that the 
rec_per_key_part buffer is reused only when the child table
have not changed, and reallocated otherwise (the old buffer is 
deallocated if necessary).

Detailed revision comments:

r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
branches/5.1:

Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation

by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html

BUG#45749 - Race condition in SET GLOBAL innodb_commit_concurrency=DEFAULT

Detailed revision comments:

r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
branches/5.1: Merge r5418 from branches/zip:

  ------------------------------------------------------------------------
  r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
     M /branches/zip/mysql-test/innodb_bug42101.result
     M /branches/zip/mysql-test/innodb_bug42101.test
  
  branches/zip: Fix a race condition caused by
  SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
  When innodb_commit_concurrency is initially set nonzero,
  DEFAULT would change it back to 0, triggering Bug #42101.
  rb://139 approved by Heikki Tuuri.
  ------------------------------------------------------------------------

1. Fixes build warnings caused by applying snapshot 5.1-ss5282

2. Fix the Makefile.am in storage/innobase to remove the header file
   'fsp0types.h' which was added twice to fix build warning generated 
   after applying the 5.1-ss5282 snapshot

Detailed revision comments:

r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.

unnecessarily
      
The problem is that libmysqlclient.so is built with THREAD
undefined, while a client compiling against the same header
files will see THREAD as defined and definitions in
my_pthread.h will be included, possibly resulting in undefined
symbols that cannot be resolved with libmysqlclient.so.
      
The suggested solution is to require that clients wanting to
link with libmysqlclient.so should be built with
MYSQL_CLIENT_NO_THREADS defined. This requires a documentation
change, and more details for this will be supplied if this
patch is approved.
      
The MYSQL_CLIENT_NO_THREADS define was renamed from
UNDEF_THREADS_HACK, to get a more suitable (less suspicious)
name for the define. (The UNDEF_THREADS_HACK is retained for
backwards compatibility, though.)
      
This patch is also in anticipation of WL#4958, which will
remove this problem altogether by dropping the building of
libmysqlclient.

Item_field::fix_fields()