3442 Marc Alff 2012-02-20 [merge]
Merge mysql-trunk --> mysql-trunk-wl5767
added:
include/my_rnd.h
mysql-test/r/bug33509.result
mysql-test/suite/binlog/r/binlog_server_start_options.result
mysql-test/suite/binlog/t/binlog_server_start_options.test
mysql-test/suite/innodb/r/innodb-blob.result
mysql-test/suite/innodb/t/innodb-blob.test
mysql-test/t/bug33509.test
sql/md5.cc
sql/my_rnd.cc
sql/sha1.cc
modified:
include/CMakeLists.txt
include/m_ctype.h
include/my_base.h
include/my_bitmap.h
include/my_global.h
include/my_md5.h
include/my_sys.h
include/myisam.h
include/mysql/psi/mysql_socket.h
include/mysql/psi/mysql_table.h
include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/psi/psi_abi_v1.h
include/mysql_time.h
include/sha1.h
include/sql_common.h
include/sslopt-case.h
include/sslopt-longopts.h
include/sslopt-vars.h
include/violite.h
include/waiting_threads.h
include/welcome_copyright_notice.h
libmysql/CMakeLists.txt
mysql-test/collections/default.experimental
mysql-test/include/subquery_sj.inc
mysql-test/r/group_by.result
mysql-test/r/innodb_ignore_builtin.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_bka.result
mysql-test/r/subquery_sj_all_bka_nixbnl.result
mysql-test/r/subquery_sj_all_bkaunique.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_bka.result
mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
mysql-test/r/subquery_sj_dupsweed_bkaunique.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_bka.result
mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
mysql-test/r/subquery_sj_firstmatch_bkaunique.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_bka.result
mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
mysql-test/r/subquery_sj_loosescan_bkaunique.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_bka.result
mysql-test/r/subquery_sj_mat_bka_nixbnl.result
mysql-test/r/subquery_sj_mat_bkaunique.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_bka.result
mysql-test/r/subquery_sj_none_bka_nixbnl.result
mysql-test/r/subquery_sj_none_bkaunique.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_temporal_fractional.result
mysql-test/suite/opt_trace/include/general.inc
mysql-test/suite/opt_trace/include/general2.inc
mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
mysql-test/suite/opt_trace/r/charset.result
mysql-test/suite/opt_trace/r/filesort_pq.result
mysql-test/suite/opt_trace/r/general2_no_prot.result
mysql-test/suite/opt_trace/r/general2_ps_prot.result
mysql-test/suite/opt_trace/r/general_no_prot_all.result
mysql-test/suite/opt_trace/r/general_no_prot_none.result
mysql-test/suite/opt_trace/r/general_ps_prot_all.result
mysql-test/suite/opt_trace/r/general_ps_prot_none.result
mysql-test/suite/opt_trace/r/range_no_prot.result
mysql-test/suite/opt_trace/r/range_ps_prot.result
mysql-test/suite/opt_trace/r/security_no_prot.result
mysql-test/suite/opt_trace/r/security_ps_prot.result
mysql-test/suite/opt_trace/r/subquery_no_prot.result
mysql-test/suite/opt_trace/r/subquery_ps_prot.result
mysql-test/t/group_by.test
mysql-test/t/innodb_ignore_builtin.test
mysql-test/t/type_newdecimal.test
mysql-test/t/type_temporal_fractional.test
mysys/CMakeLists.txt
mysys/md5.c
mysys/mf_format.c
mysys/sha1.c
sql-common/my_time.c
sql/CMakeLists.txt
sql/handler.cc
sql/item.cc
sql/item.h
sql/item_func.cc
sql/item_func.h
sql/item_strfunc.cc
sql/keycaches.h
sql/mysqld.cc
sql/opt_range.cc
sql/password.c
sql/rpl_info_factory.cc
sql/signal_handler.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_class.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_optimizer.cc
sql/sql_optimizer.h
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_priv.h
sql/sql_resolver.cc
sql/sql_select.cc
sql/sql_tmp_table.cc
sql/sql_union.cc
sql/sys_vars.cc
sql/table.cc
storage/innobase/btr/btr0btr.cc
storage/innobase/btr/btr0cur.cc
storage/innobase/buf/buf0dblwr.cc
storage/innobase/dict/dict0boot.cc
storage/innobase/dict/dict0crea.cc
storage/innobase/dict/dict0load.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/fsp/fsp0fsp.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.cc
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0cur.h
storage/innobase/include/btr0cur.ic
storage/innobase/include/dict0boot.h
storage/innobase/include/dict0mem.h
storage/innobase/include/fil0fil.h
storage/innobase/include/fsp0fsp.h
storage/innobase/include/log0log.h
storage/innobase/include/mtr0mtr.h
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/trx0rec.ic
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/lock/lock0lock.cc
storage/innobase/mtr/mtr0mtr.cc
storage/innobase/row/row0ins.cc
storage/innobase/row/row0merge.cc
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0sel.cc
storage/innobase/row/row0upd.cc
storage/innobase/srv/srv0start.cc
storage/innobase/trx/trx0rec.cc
storage/innobase/trx/trx0trx.cc
storage/innobase/trx/trx0undo.cc
vio/vio.c
vio/viosocket.c
3441 Mayank Prasad 2012-02-20
WL#5767 : Performance Schema, Statements Digest.
Details:
- Modified code to capture statements giving ERROR/WARNINGS.
- Added code to collect stats of ERROR/WARNING/ROW_AFFECTED counts.
- Added/Modified test cases accordingly.
modified:
mysql-test/suite/perfschema/include/digest_execution.inc
mysql-test/suite/perfschema/r/digest_table_full.result
mysql-test/suite/perfschema/r/start_server_no_digests.result
mysql-test/suite/perfschema/r/statement_digest.result
mysql-test/suite/perfschema/r/statement_digest_consumers.result
mysql-test/suite/perfschema/r/statement_digest_consumers2.result
mysql-test/suite/perfschema/t/digest_table_full.test
mysql-test/suite/perfschema/t/start_server_no_digests.test
mysql-test/suite/perfschema/t/statement_digest.test
storage/perfschema/pfs.cc
Diff too large for email (10401 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5767 branch (marc.alff:3441 to 3442) | Marc Alff | 20 Feb |
