From: Marc Alff Date: May 11 2012 1:27pm Subject: bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3506 to 3507) List-Archive: http://lists.mysql.com/commits/144127 Message-Id: <201205111327.q4BDRhjk025909@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3507 Marc Alff 2012-05-11 [merge] Merge mysql-trunk --> mysql-trunk-pfs-tuning added: BUILD/SETUP.sh BUILD/build_mccge.sh mysql-test/r/blackhole.result mysql-test/suite/innodb/r/innodb_bug13635833.result mysql-test/suite/innodb/r/innodb_bug14006907.result mysql-test/suite/innodb/r/innodb_bug14007649.result mysql-test/suite/innodb/r/innodb_stats_rename_table.result mysql-test/suite/innodb/r/innodb_stats_rename_table_if_exists.result mysql-test/suite/innodb/t/innodb_bug13635833.test mysql-test/suite/innodb/t/innodb_bug14006907.test mysql-test/suite/innodb/t/innodb_bug14007649.test mysql-test/suite/innodb/t/innodb_stats_rename_table.test mysql-test/suite/innodb/t/innodb_stats_rename_table_if_exists.test mysql-test/suite/rpl/r/rpl_row_merge_engine.result mysql-test/suite/rpl/t/rpl_row_merge_engine.test mysql-test/t/blackhole.test modified: CMakeLists.txt dbug/dbug.c include/my_base.h include/mysql/psi/mysql_socket.h mysql-test/collections/default.experimental mysql-test/include/ctype_inet.inc mysql-test/include/index_merge1.inc mysql-test/include/index_merge2.inc mysql-test/include/index_merge_ror.inc mysql-test/include/subquery.inc mysql-test/r/cast.result mysql-test/r/ctype_ascii.result mysql-test/r/ctype_big5.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1250_ch.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_errors.result mysql-test/r/ctype_eucjpms.result mysql-test/r/ctype_euckr.result mysql-test/r/ctype_gb2312.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_latin2.result mysql-test/r/ctype_sjis.result mysql-test/r/ctype_tis620.result mysql-test/r/ctype_ujis.result mysql-test/r/ctype_utf8.result mysql-test/r/ctype_utf8mb4.result mysql-test/r/errors.result mysql-test/r/gis.result mysql-test/r/index_merge_innodb.result mysql-test/r/lowercase_table4.result mysql-test/r/multi_update.result mysql-test/r/multi_update_innodb.result mysql-test/r/sp-bugs.result mysql-test/r/sp-destruct.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_all_bka_nixbnl.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_none_bka_nixbnl.result mysql-test/r/subselect_innodb.result mysql-test/r/user_var.result mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/innodb/r/innodb-system-table-view.result mysql-test/suite/innodb/r/innodb_stats_drop_locked.result mysql-test/suite/innodb/t/innodb_bug13867871.test mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test mysql-test/t/cast.test mysql-test/t/ds_mrr-big.test mysql-test/t/errors.test mysql-test/t/gis.test mysql-test/t/index_merge_innodb.test mysql-test/t/multi_update.test mysql-test/t/multi_update_innodb.test mysql-test/t/sp-bugs.test mysql-test/t/subselect_innodb.test mysql-test/t/user_var.test mysys/my_handler_errors.h scripts/mysql_system_tables.sql sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/handler.cc sql/handler.h sql/item.cc sql/item_inetfunc.cc sql/item_subselect.cc sql/log_event.cc sql/log_event_old.cc sql/password.c sql/rpl_reporting.cc sql/rpl_reporting.h sql/rpl_rli.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/spatial.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_delete.cc sql/sql_planner.h sql/sql_select.cc sql/sql_update.cc sql/table.cc sql/table.h storage/blackhole/ha_blackhole.cc storage/innobase/btr/btr0cur.cc storage/innobase/dict/dict0boot.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0stats.cc storage/innobase/fil/fil0fil.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0crea.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0mem.h storage/innobase/include/dict0stats.h storage/innobase/include/dict0stats.ic storage/innobase/include/lock0lock.h storage/innobase/include/read0read.h storage/innobase/include/univ.i storage/innobase/lock/lock0lock.cc storage/innobase/lock/lock0wait.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0mysql.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/sync/sync0sync.cc storage/innobase/ut/ut0ut.cc 3506 Marc Alff 2012-05-09 [merge] Merge mysql-trunk --> mysql-trunk-pfs-tuning added: unittest/gunit/field_date-t.cc unittest/gunit/field_datetime-t.cc unittest/gunit/field_long-t.cc unittest/gunit/field_newdecimal-t.cc unittest/gunit/field_temporal_utils.h unittest/gunit/gunit_test_main_server.cc modified: client/mysqldump.c mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc mysql-test/include/index_merge2.inc mysql-test/include/wait_condition.inc mysql-test/r/ctype_ucs.result mysql-test/r/index_merge_myisam.result mysql-test/r/mysqldump.result mysql-test/r/type_bit.result mysql-test/r/variables-big.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test mysql-test/t/ctype_ucs.test mysql-test/t/events_time_zone.test mysql-test/t/mysqldump.test mysql-test/t/type_bit.test mysql-test/t/variables-big.test sql-common/my_time.c sql/field.cc sql/field.h sql/field_conv.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.h sql/item_timefunc.cc sql/item_timefunc.h sql/opt_range.cc sql/rpl_slave.cc sql/sql_base.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_select.h sql/sql_yacc.yy sql/unireg.cc storage/innobase/include/ut0counter.h unittest/gunit/CMakeLists.txt unittest/gunit/copy_info-t.cc unittest/gunit/create_field-t.cc unittest/gunit/decimal-t.cc unittest/gunit/fake_table.h unittest/gunit/field-t.cc unittest/gunit/field_timestamp-t.cc unittest/gunit/get_diagnostics-t.cc unittest/gunit/item-t.cc unittest/gunit/item_func_now_local-t.cc unittest/gunit/join_tab_sort-t.cc unittest/gunit/my_decimal-t.cc unittest/gunit/opt_range-t.cc unittest/gunit/segfault-t.cc unittest/gunit/sql_table-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h unittest/unit.pl Diff too large for email (11935 lines, the limit is 10000). No bundle (reason: useless for push emails).