> ------------------------------------------------------------
> revno: 3452.13.4 [merge]
> revision-id: mmakela@bk-internal.mysql.com-20101011192851-u3bdt7erjkrgn90t
> parent: marko.makela@oracle.com-20101011081800-sby6kmb8n1mnryfq
> parent: jimmy.yang@oracle.com-20101011123613-guz1qgdktywmel1g
> committer: Marko Makela <mmakela@bk-internal.mysql.com>
> branch nick: mysql-5.1-security
> timestamp: Mon 2010-10-11 21:28:51 +0200
> message:
>   Merge Bug #57345, Bug #56982, Bug#53307 test from mysql-5.1-innodb
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

> ------------------------------------------------------------
> revno: 3351.14.280
> revision-id: inaam.rana@oracle.com-20101026205418-aq835zpvxdskdf4c
> parent: jimmy.yang@oracle.com-20101025055121-j319j363abfgdh6n
> committer: Inaam Rana <inaam.rana@oracle.com>
> branch nick: mysql-5.1-innodb
> timestamp: Tue 2010-10-26 16:54:18 -0400
> message:
>   Bug #57611	ibdata file and continuous growing undo logs
>   rb://498
>   
>   Fix handling of update_undo_logs at trx commit. Previously, when
>   rseg->update_undo_list grows beyond 500 the update_undo_logs were
>   marked with state TRX_UNDO_TO_FREE which should have been
>   TRX_UNDO_TO_PURGE.
>   
>   Approved by: Sunny Bains

> ------------------------------------------------------------
> revno: 1810.3987.44
> revision-id: alexander.nozdrin@oracle.com-20101124095339-oatpqq684jpbbso2
> parent: alexander.nozdrin@oracle.com-20101122132749-tl6m39zsfgvzi2mf
> committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
> branch nick: mysql-5.0-bugteam
> timestamp: Wed 2010-11-24 12:53:39 +0300
> message:
>   A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
>   EXCEPTIONS-CLIENT from all the places.

> ------------------------------------------------------------
> revno: 1810.3987.43
> revision-id: alexander.nozdrin@oracle.com-20101122132749-tl6m39zsfgvzi2mf
> parent: alexander.nozdrin@oracle.com-20101122132550-hcu608iuq5un9k0q
> committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
> branch nick: mysql-5.0-bugteam
> timestamp: Mon 2010-11-22 16:27:49 +0300
> message:
>   Patch for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file).

rb://477 approved by Marko

row_search_for_mysql(): Acquire an intention lock on the table
before locking the first record gap.

row_search_for_mysql(): Acquire an intention lock on the table
before locking the first record gap.

LOAD DATA into partitioned MyISAM table

Problem was that both partitioning and myisam
used the same table_share->mutex for different protections
(auto inc and repair).

Solved by adding a specific mutex for the partitioning
auto_increment.

Also adding destroying the ha_data structure in
free_table_share (which is to be propagated
into 5.5).

This is a 5.1 ONLY patch, already fixed in 5.5+.

The crash happens because original join table is replaced with temporary table
at execution stage and later we attempt to use this temporary table in
select_describe. It might happen that
Item_subselect::update_used_tables() method which sets const_item flag
is not called by some reasons (no where/having conditon in subquery for example).
It prevents JOIN::join_tmp creation and breaks original join.
The fix is to call ::update_used_tables() before ::const_item() check.

Added sanity check, similar to the one preventing send without reap

Bug#57113: ha_partition::extra(ha_extra_function):
            Assertion `m_extra_cache' failed

Fix for bug#55458 included DBUG_ASSERTS causing
debug builds of the server to crash on
another multi-table update.

Removed the asserts since they where wrong.
(updated after testing the patch in 5.5).

This is a simple optimization issue. All stats are related to only indexed
columns, index size or number of rows in the whole table. UPDATEs that touch
only non-indexed columns cannot affect stats and we can avoid calling the
function row_update_statistics_if_needed() which may result in unnecessary I/O.

Approved by:	Marko (rb://466)

Trying to run perl fails, just like it does when perl is started but fails
Trap the case that perl was not found/could not be started, and skip test
Also force a restart of servers since test may already have done something
mtr now also appends path of current perl to PATH to aid mysqltest

TYPE __sync_lock_test_and_set (TYPE *ptr, TYPE value, ...)

it is not documented what happens if the two arguments are of different
type like it was before: the first one was lock_word_t (byte) and the
second one was 1 or 0 (int).

Approved by:	Marko (via IRC)

This happens when creating new tmpdir due to too long socket path
Don't delete it if --start-and-exit, but warn user to do it.

InnoDB Plugin 1.0.12 has been released with MySQL 5.1.51.