From: Bjorn Munch
Date: March 11 2011 9:59am
Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3044 to 3046)
List-Archive: http://lists.mysql.com/commits/132800
Message-Id: <201103110959.p2B9xwi0009143@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3046 Bjorn Munch	2011-03-11 [merge]
      null upmerge

    modified:
      mysql-test/collections/default.daily
 3045 Bjorn Munch	2011-03-11 [merge]
      merge from trunk main

    added:
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/t/relaylog.test
    modified:
      client/mysql.cc
      client/sql_string.cc
      client/sql_string.h
      include/ft_global.h
      include/m_ctype.h
      include/my_global.h
      include/my_handler.h
      include/my_sys.h
      include/my_tree.h
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h
      include/mysql/plugin_ftparser.h.pp
      libmysqld/lib_sql.cc
      mysql-test/collections/default.weekly
      mysql-test/r/grant.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/sp.result
      mysql-test/r/trigger.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/t/disabled.def
      mysql-test/t/grant.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/sp.test
      mysql-test/t/trigger.test
      mysys/charset.c
      mysys/mf_qsort.c
      mysys/my_conio.c
      mysys/my_handler.c
      mysys/tree.c
      regex/debug.c
      regex/debug.ih
      regex/engine.c
      regex/engine.ih
      regex/my_regex.h
      regex/regcomp.c
      regex/regcomp.ih
      regex/reginit.c
      scripts/mysqld_multi.sh
      sql/binlog.cc
      sql/binlog.h
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/gstream.h
      sql/ha_partition.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_create.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/key.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/procedure.h
      sql/protocol.cc
      sql/protocol.h
      sql/rpl_rli.cc
      sql/rpl_utility.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_db.h
      sql/sql_delete.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_sort.h
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_trigger.cc
      sql/sql_yacc.yy
      sql/strfunc.cc
      sql/strfunc.h
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/thr_malloc.h
      sql/uniques.cc
      storage/heap/hp_hash.c
      storage/innobase/handler/ha_innodb.cc
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ft_parser.c
      storage/myisam/ft_static.c
      storage/myisam/ft_update.c
      storage/myisam/ftdefs.h
      storage/myisam/mi_key.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/my_strchr.c
      strings/my_vsnprintf.c
 3044 Bjorn Munch	2011-03-08 [merge]
      Add extra line after unit test report in MTR

    modified:
      mysql-test/mysql-test-run.pl

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