From: Jon Olav Hauglid
Date: November 18 2010 4:36pm
Subject: bzr push into mysql-trunk branch (jon.hauglid:3355 to 3356)
List-Archive: http://lists.mysql.com/commits/124326
Message-Id: <201011181636.oAIEkAF7028036@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3356 Jon Olav Hauglid	2010-11-18 [merge]
      Merge from mysql-5.5-bugteam to mysql-trunk-bugfixing
      Text conflict in mysql-test/suite/perfschema/r/func_file_io.result
      Text conflict in mysql-test/suite/perfschema/t/func_file_io.test
      Text conflict in mysql-test/t/kill.test
      Text conflict in sql/handler.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/mysqld.h

    removed:
      mysql-test/t/flush_read_lock_kill-master.opt
    added:
      mysql-test/include/check_ftwrl_compatible.inc
      mysql-test/include/check_ftwrl_incompatible.inc
      mysql-test/r/flush_read_lock.result
      mysql-test/t/flush_read_lock.test
    modified:
      include/mysql_com.h
      mysql-test/include/handler.inc
      mysql-test/include/wait_show_condition.inc
      mysql-test/r/delayed.result
      mysql-test/r/events_2.result
      mysql-test/r/flush.result
      mysql-test/r/flush_read_lock_kill.result
      mysql-test/r/func_misc.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/kill.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/partition_debug_sync.result
      mysql-test/r/sp-lock.result
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/func_mutex.result
      mysql-test/suite/perfschema/r/global_read_lock.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/func_file_io.test
      mysql-test/suite/perfschema/t/func_mutex.test
      mysql-test/suite/perfschema/t/global_read_lock.test
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
      mysql-test/t/delayed.test
      mysql-test/t/disabled.def
      mysql-test/t/events_2.test
      mysql-test/t/flush.test
      mysql-test/t/flush_block_commit.test
      mysql-test/t/flush_block_commit_notembedded.test
      mysql-test/t/flush_read_lock_kill.test
      mysql-test/t/func_misc.test
      mysql-test/t/kill.test
      mysql-test/t/lock_multi.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/partition_debug_sync.test
      mysql-test/t/sp-lock.test
      mysql-test/t/trigger_notembedded.test
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_queue.cc
      sql/events.cc
      sql/events.h
      sql/ha_ndbcluster.cc
      sql/handler.cc
      sql/handler.h
      sql/item.h
      sql/lock.cc
      sql/lock.h
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/protocol.cc
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_handler.h
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_trigger.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      sql/transaction.cc
      tests/mysql_client_test.c
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
 3355 Alexander Barkov	2010-11-18 [merge]
      Merging from mysql-5.5-bugteam

    modified:
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
      sql/event_data_objects.cc
      sql/log_event.cc
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sql_audit.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_show.cc
      storage/myisam/ha_myisam.cc

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