3223 Christopher Powers 2011-02-04
merge
modified:
include/mysql/psi/mysql_socket.h*
include/mysql/psi/psi.h*
storage/perfschema/CMakeLists.txt*
storage/perfschema/pfs.cc*
storage/perfschema/pfs_column_types.h*
storage/perfschema/pfs_engine_table.cc*
storage/perfschema/pfs_events_waits.h*
storage/perfschema/pfs_instr.cc*
storage/perfschema/pfs_instr.h*
storage/perfschema/pfs_instr_class.cc*
storage/perfschema/pfs_instr_class.h*
storage/perfschema/pfs_stat.h*
storage/perfschema/table_events_waits.cc*
storage/perfschema/table_events_waits_summary.cc*
storage/perfschema/table_socket_instances.cc*
storage/perfschema/table_socket_instances.h*
3222 Christopher Powers 2011-02-02
WL#4896 "Performance Schema Net IO"
- Updated abi files
- Fixed compiler warnings
- Updates to table definition of socket_instances
modified:
include/mysql/psi/psi_abi_v1.h.pp
include/mysql/psi/psi_abi_v2.h.pp
storage/perfschema/pfs.cc
storage/perfschema/table_socket_instances.cc*
storage/perfschema/table_socket_instances.h*
=== modified file 'include/mysql/psi/mysql_socket.h' (properties changed: +x to -x)
=== modified file 'include/mysql/psi/psi.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/CMakeLists.txt' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_column_types.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_engine_table.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_events_waits.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr_class.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr_class.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_stat.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_events_waits.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_events_waits_summary.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_socket_instances.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_socket_instances.h' (properties changed: +x to -x)
Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110204073517-ltu0wwe5l5uj5i14.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-wl5379 branch (chris.powers:3222 to 3223) | Christopher Powers | 4 Feb |