> ------------------------------------------------------------
> revno: 3517
> revision-id: sergey.glukhov@oracle.com-20101213103926-okypkn10adeeyns8
> parent: davi.arnaut@oracle.com-20101207150620-s49dstok48oy585o
> committer: Sergey Glukhov <sergey.glukhov@oracle.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Mon 2010-12-13 13:39:26 +0300
> message:
>   Bug#58396 group_concat and explain extended are still crashy
>   Explain fails at fix_fields stage and some items are left unfixed,
>   particulary Item_group_concat. Item_group_concat::orig_args field
>   is uninitialized in this case and Item_group_concat::print call 
>   leads to crash.
>   The fix:
>   move the initialization of Item_group_concat::orig_args
>   into constructor.

> ------------------------------------------------------------
> revno: 3507.1.7
> revision-id: guilhem@mysql.com-20101122085759-53uuoyqyjkh4em2m
> parent: davi.arnaut@oracle.com-20101120142951-l0f3bxmcwibcplxq
> committer: Guilhem Bichot <guilhem@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Mon 2010-11-22 09:57:59 +0100
> message:
>   Fix for Bug#56138 "valgrind errors about overlapping memory when double-assigning same variable",
>   and related small fixes.

> ------------------------------------------------------------
> revno: 3507.1.26
> revision-id: mattias.jonsson@oracle.com-20101201112046-2ugtweya0dltcrys
> parent: nirbhay.choubey@sun.com-20101201065531-w2f0j3g5yzok8z9x
> committer: Mattias Jonsson <mattias.jonsson@oracle.com>
> branch nick: b56380-51-bt
> timestamp: Wed 2010-12-01 12:20:46 +0100
> message:
>   Bug#56380: valgrind memory leak warning from partition tests
>   
>   There could be memory leaks if ALTER ... PARTITION command fails.
>   
>   Problem was that the list of items to free was not set in
>   the partition info structure when fix_partition_func call failed
>   during ALTER ... PARTITION.
>   
>   Solved by always setting the list in the partition info struct.

> ------------------------------------------------------------
> revno: 3504
> revision-id: svoj@oracle.com-20101111100317-3bjzbj6c2ihfzb9t
> parent: dmitry.shulga@oracle.com-20101111045251-jl1spfh3xjti1sll
> committer: Sergey Vojtovich <svoj@oracle.com>
> branch nick: mysql-5.1-bugteam-bug58079
> timestamp: Thu 2010-11-11 13:03:17 +0300
> message:
>   BUG#58079 - Remove the IBM DB2 storage engine

> ------------------------------------------------------------
> revno: 3496.1.39
> revision-id: jon.hauglid@oracle.com-20101019081957-zf2ohl7wgnhvnnb0
> parent: tor.didriksen@oracle.com-20101019070648-jhi9ezq3b5qk4wcm
> committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
> branch nick: mysql-5.1-bugteam-bug57274
> timestamp: Tue 2010-10-19 10:19:57 +0200
> message:
>   Bug #57274 SET GLOBAL debug crashes on Solaris in embedded server mode
>              (variables_debug fails)
>   
>   The problem was that "SET GLOBAL debug" could cause a crash on Solaris.
>   The crash happened if the server failed to open the trace file given in 
>   the "SET GLOBAL debug" statement. This caused an error message to be
>   printed to stderr containing the process name. However, printing to
>   stderr crashed the server since the pointer to the process name had
>   not been initialized.
>   
>   This patch fixes the problem by initializing the process name 
>   properly when doing "SET GLOBAL debug".
>   
>   No test case added as this bug was repeatable with existing test
>   coverage in variables_debug.test.

> ------------------------------------------------------------
> revno: 3452.17.1
> revision-id: mattias.jonsson@oracle.com-20101005125751-ds92svhhb13ds8ri
> parent: sergey.glukhov@sun.com-20101004085126-ia6veky4w6j87i43
> committer: Mattias Jonsson <mattias.jonsson@oracle.com>
> branch nick: b55091-51-security
> timestamp: Tue 2010-10-05 14:57:51 +0200
> message:
>   Bug#55091: Server crashes on ADD PARTITION after a failed attempt
>   
>   In case of failure in ALTER ... PARTITION under LOCK TABLE
>   the server could crash, due to it had modified the locked
>   table object, which was not reverted in case of failure,
>   resulting in a bad table definition used after the failed
>   command.
>   
>   Solved by always closing the LOCKED TABLE, even in case
>   of error.
>   
>   Note: this is a 5.1-only fix, bug#56172 fixed it in 5.5+

> ------------------------------------------------------------
> revno: 3452.13.54
> revision-id: oystein.grovlen@oracle.com-20110112093715-tc076voaxwblqk8v
> parent: georgi.kodinov@oracle.com-20110110130833-1c9q21mr7zoq07vg
> committer: Oystein Grovlen <oystein.grovlen@oracle.com>
> branch nick: mysql-5.1-security
> timestamp: Wed 2011-01-12 10:37:15 +0100
> message:
>   Bug#59211: Select Returns Different Value for min(year) Function
>   
>   get_year_value() contains code to convert 2-digits year to
>   4-digits.  The fix for Bug#49910 added a check on the size of
>   the underlying field so that this conversion is not done for
>   YEAR(4) values. (Since otherwise one would convert invalid
>   YEAR(4) values to valid ones.)
>   
>   The existing check does not work when Item_cache is used, since
>   it is not detected when the cache is based on a Field.  The
>   reported change in behavior is due to Bug#58030 which added
>   extra cached items in min/max computations.
>   
>   The elegant solution would be to implement
>   Item_cache::real_item() to return the underlying Item.
>   However, some side effects are observed (change in explain
>   output) that indicates that such a change is not straight-
>   forward, and definitely not appropriate for an MRU.
>   
>   Instead, a Item_cache::field() method has been added in order
>   to get access to the underlying field.  (This field() method
>   eliminates the need for Item_cache::eq_def() used in
>   test_if_ref(), but in order to limit the scope of this fix,
>   that code has been left as is.)

> ------------------------------------------------------------
> 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.


mysql-test/r/ps.result:
  test case
mysql-test/t/ps.test:
  test case
sql/item_subselect.cc:
  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).

mysql-test/r/partition.result:
  updated result
mysql-test/t/partition.test:
  Added test for bug#57113
sql/ha_partition.cc:
  Removed the assert for m_extra_cache when
  ::extra(HA_PREPARE_FOR_UPDATE) was called.

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)