From: Bjorn Munch
Date: October 21 2010 1:27pm
Subject: bzr push into mysql-5.5-mtr branch (bjorn.munch:3104 to 3105)
List-Archive: http://lists.mysql.com/commits/121539
Message-Id: <201010211327.o9LDR3Dd015186@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3105 Bjorn Munch	2010-10-21 [merge]
      sorry null upmerge

 3104 Bjorn Munch	2010-10-21 [merge]
      merge from 5.5

    added:
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/t/checksum.test
    modified:
      client/mysqldump.c
      client/mysqltest.cc
      cmake/dtrace.cmake
      dbug/dbug.c
      include/mysql/service_my_snprintf.h
      libmysqld/Makefile.am
      libmysqld/lib_sql.cc
      mysql-test/CMakeLists.txt
      mysql-test/collections/default.experimental
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/include/default_mysqld.cnf
      mysql-test/r/func_time.result
      mysql-test/r/parser.result
      mysql-test/r/select.result
      mysql-test/r/strict.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_newdecimal.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/perfschema/include/upgrade_check.inc
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/disabled.def
      mysql-test/t/log_tables_debug.test
      mysql-test/t/strict.test
      mysql-test/t/type_datetime.test
      mysql-test/t/type_newdecimal.test
      mysql-test/valgrind.supp
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/my_sync.c
      sql/derror.cc
      sql/field.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_plugin.cc
      sql/sql_repl.cc
      sql/sql_yacc.yy
      sql/sys_vars.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      strings/my_vsnprintf.c
      unittest/mysys/my_vsnprintf-t.c
No bundle (reason: useless for push emails).