From: Mattias Jonsson
Date: January 10 2011 4:49pm
Subject: bzr push into mysql-5.1 branch (mattias.jonsson:3538 to 3539)
List-Archive: http://lists.mysql.com/commits/128343
Message-Id: <201101101651.p0ADOfFA002570@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3539 Mattias Jonsson	2011-01-10 [merge]
      merge

    modified:
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      sql/item.h
      sql/item_func.h
      sql/item_timefunc.h
      sql/sql_partition.cc
      sql/table.cc
 3538 Vasil Dimov	2011-01-08 [merge]
      Merge mysql-5.1-innodb -> mysql-5.1

    added:
      mysql-test/suite/innodb_plugin/r/innodb-autoinc-18274.result
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
    modified:
      mysql-test/suite/innodb/t/innodb_bug57255.test
      mysql-test/suite/innodb_plugin/r/innodb.result
      mysql-test/suite/innodb_plugin/t/innodb.test
      mysql-test/suite/innodb_plugin/t/innodb_bug57255.test
      sql/sql_show.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0mem.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/include/buf0buf.ic
      storage/innobase/log/log0recv.c
      storage/innobase/row/row0mysql.c
      storage/innobase/ut/ut0dbg.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/dict/dict0dict.c
      storage/innodb_plugin/fsp/fsp0fsp.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/i_s.cc
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/data0data.h
      storage/innodb_plugin/include/data0data.ic
      storage/innodb_plugin/include/row0upd.h
      storage/innodb_plugin/include/trx0i_s.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/log/log0recv.c
      storage/innodb_plugin/plug.in
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0purge.c
      storage/innodb_plugin/row/row0umod.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/trx/trx0i_s.c
      storage/innodb_plugin/ut/ut0dbg.c

Diff too large for email (16303 lines, the limit is 10000).
No bundle (reason: useless for push emails).