From: Bjorn Munch
Date: January 12 2011 3:15pm
Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3004 to 3006)
List-Archive: http://lists.mysql.com/commits/128526
Message-Id: <201101121515.p0CFF4n4023189@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3006 Bjorn Munch	2011-01-12 [merge]
      upmerge with follow-up to 58841

    modified:
      mysql-test/mysql-test-run.pl
 3005 Bjorn Munch	2011-01-12 [merge]
      merge from trunk

    modified:
      mysql-test/collections/default.experimental
      mysql-test/include/subquery.inc
      mysql-test/r/filesort_debug.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_range.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      mysql-test/r/udf.result
      mysql-test/r/union.result
      mysql-test/r/view_grant.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/filesort_debug.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_range.test
      mysql-test/t/udf.test
      mysql-test/t/union.test
      mysql-test/t/view_grant.test
      mysys/my_getsystime.c
      sql/handler.cc
      sql/item.h
      sql/item_func.h
      sql/item_subselect.cc
      sql/item_timefunc.h
      sql/log_event.cc
      sql/log_event.h
      sql/net_serv.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_partition.cc
      sql/sql_select.cc
      sql/sql_udf.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/table.cc
 3004 Bjorn Munch	2011-01-12 [merge]
      upmerge 58841,58896,58900,59002,59153,59182,59216

    added:
      mysql-test/include/plugin.defs
    modified:
      client/mysqltest.cc
      mysql-test/collections/README.experimental
      mysql-test/collections/default.experimental
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_report.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqltest.result
      mysql-test/suite/bugs/t/bug57108.test
      mysql-test/t/bug46261.test
      mysql-test/t/fulltext_plugin.test
      mysql-test/t/mysqltest.test
      mysql-test/t/plugin.test
      mysql-test/t/plugin_auth_qa_2-master.opt
      mysql-test/t/plugin_auth_qa_3-master.opt
      mysql-test/t/plugin_not_embedded.test

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