From: Tor Didriksen Date: May 12 2011 1:24pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3371) List-Archive: http://lists.mysql.com/commits/137223 Message-Id: <20110512132414.CE3263793@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9060682096214869716==" --===============9060682096214869716== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/trunk/ based on revid:tatjana.nuernberg@stripped 3371 Tor Didriksen 2011-05-12 resurrect lost file: merge include/probes_mysql_nodtrace.h -r 3369..3368 added: include/probes_mysql_nodtrace.h === added file 'include/probes_mysql_nodtrace.h' --- a/include/probes_mysql_nodtrace.h 1970-01-01 00:00:00 +0000 +++ b/include/probes_mysql_nodtrace.h 2011-05-12 13:24:09 +0000 @@ -0,0 +1,129 @@ +/* + * Generated by dheadgen(1). + */ + +#ifndef _PROBES_MYSQL_D +#define _PROBES_MYSQL_D + +#ifdef __cplusplus +extern "C" { +#endif + +#define MYSQL_CONNECTION_START(arg0, arg1, arg2) +#define MYSQL_CONNECTION_START_ENABLED() (0) +#define MYSQL_CONNECTION_DONE(arg0, arg1) +#define MYSQL_CONNECTION_DONE_ENABLED() (0) +#define MYSQL_COMMAND_START(arg0, arg1, arg2, arg3) +#define MYSQL_COMMAND_START_ENABLED() (0) +#define MYSQL_COMMAND_DONE(arg0) +#define MYSQL_COMMAND_DONE_ENABLED() (0) +#define MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4) +#define MYSQL_QUERY_START_ENABLED() (0) +#define MYSQL_QUERY_DONE(arg0) +#define MYSQL_QUERY_DONE_ENABLED() (0) +#define MYSQL_QUERY_PARSE_START(arg0) +#define MYSQL_QUERY_PARSE_START_ENABLED() (0) +#define MYSQL_QUERY_PARSE_DONE(arg0) +#define MYSQL_QUERY_PARSE_DONE_ENABLED() (0) +#define MYSQL_QUERY_CACHE_HIT(arg0, arg1) +#define MYSQL_QUERY_CACHE_HIT_ENABLED() (0) +#define MYSQL_QUERY_CACHE_MISS(arg0) +#define MYSQL_QUERY_CACHE_MISS_ENABLED() (0) +#define MYSQL_QUERY_EXEC_START(arg0, arg1, arg2, arg3, arg4, arg5) +#define MYSQL_QUERY_EXEC_START_ENABLED() (0) +#define MYSQL_QUERY_EXEC_DONE(arg0) +#define MYSQL_QUERY_EXEC_DONE_ENABLED() (0) +#define MYSQL_INSERT_ROW_START(arg0, arg1) +#define MYSQL_INSERT_ROW_START_ENABLED() (0) +#define MYSQL_INSERT_ROW_DONE(arg0) +#define MYSQL_INSERT_ROW_DONE_ENABLED() (0) +#define MYSQL_UPDATE_ROW_START(arg0, arg1) +#define MYSQL_UPDATE_ROW_START_ENABLED() (0) +#define MYSQL_UPDATE_ROW_DONE(arg0) +#define MYSQL_UPDATE_ROW_DONE_ENABLED() (0) +#define MYSQL_DELETE_ROW_START(arg0, arg1) +#define MYSQL_DELETE_ROW_START_ENABLED() (0) +#define MYSQL_DELETE_ROW_DONE(arg0) +#define MYSQL_DELETE_ROW_DONE_ENABLED() (0) +#define MYSQL_READ_ROW_START(arg0, arg1, arg2) +#define MYSQL_READ_ROW_START_ENABLED() (0) +#define MYSQL_READ_ROW_DONE(arg0) +#define MYSQL_READ_ROW_DONE_ENABLED() (0) +#define MYSQL_INDEX_READ_ROW_START(arg0, arg1) +#define MYSQL_INDEX_READ_ROW_START_ENABLED() (0) +#define MYSQL_INDEX_READ_ROW_DONE(arg0) +#define MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0) +#define MYSQL_HANDLER_RDLOCK_START(arg0, arg1) +#define MYSQL_HANDLER_RDLOCK_START_ENABLED() (0) +#define MYSQL_HANDLER_WRLOCK_START(arg0, arg1) +#define MYSQL_HANDLER_WRLOCK_START_ENABLED() (0) +#define MYSQL_HANDLER_UNLOCK_START(arg0, arg1) +#define MYSQL_HANDLER_UNLOCK_START_ENABLED() (0) +#define MYSQL_HANDLER_RDLOCK_DONE(arg0) +#define MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0) +#define MYSQL_HANDLER_WRLOCK_DONE(arg0) +#define MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0) +#define MYSQL_HANDLER_UNLOCK_DONE(arg0) +#define MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0) +#define MYSQL_FILESORT_START(arg0, arg1) +#define MYSQL_FILESORT_START_ENABLED() (0) +#define MYSQL_FILESORT_DONE(arg0, arg1) +#define MYSQL_FILESORT_DONE_ENABLED() (0) +#define MYSQL_SELECT_START(arg0) +#define MYSQL_SELECT_START_ENABLED() (0) +#define MYSQL_SELECT_DONE(arg0, arg1) +#define MYSQL_SELECT_DONE_ENABLED() (0) +#define MYSQL_INSERT_START(arg0) +#define MYSQL_INSERT_START_ENABLED() (0) +#define MYSQL_INSERT_DONE(arg0, arg1) +#define MYSQL_INSERT_DONE_ENABLED() (0) +#define MYSQL_INSERT_SELECT_START(arg0) +#define MYSQL_INSERT_SELECT_START_ENABLED() (0) +#define MYSQL_INSERT_SELECT_DONE(arg0, arg1) +#define MYSQL_INSERT_SELECT_DONE_ENABLED() (0) +#define MYSQL_UPDATE_START(arg0) +#define MYSQL_UPDATE_START_ENABLED() (0) +#define MYSQL_UPDATE_DONE(arg0, arg1, arg2) +#define MYSQL_UPDATE_DONE_ENABLED() (0) +#define MYSQL_MULTI_UPDATE_START(arg0) +#define MYSQL_MULTI_UPDATE_START_ENABLED() (0) +#define MYSQL_MULTI_UPDATE_DONE(arg0, arg1, arg2) +#define MYSQL_MULTI_UPDATE_DONE_ENABLED() (0) +#define MYSQL_DELETE_START(arg0) +#define MYSQL_DELETE_START_ENABLED() (0) +#define MYSQL_DELETE_DONE(arg0, arg1) +#define MYSQL_DELETE_DONE_ENABLED() (0) +#define MYSQL_MULTI_DELETE_START(arg0) +#define MYSQL_MULTI_DELETE_START_ENABLED() (0) +#define MYSQL_MULTI_DELETE_DONE(arg0, arg1) +#define MYSQL_MULTI_DELETE_DONE_ENABLED() (0) +#define MYSQL_NET_READ_START() +#define MYSQL_NET_READ_START_ENABLED() (0) +#define MYSQL_NET_READ_DONE(arg0, arg1) +#define MYSQL_NET_READ_DONE_ENABLED() (0) +#define MYSQL_NET_WRITE_START(arg0) +#define MYSQL_NET_WRITE_START_ENABLED() (0) +#define MYSQL_NET_WRITE_DONE(arg0) +#define MYSQL_NET_WRITE_DONE_ENABLED() (0) +#define MYSQL_KEYCACHE_READ_START(arg0, arg1, arg2, arg3) +#define MYSQL_KEYCACHE_READ_START_ENABLED() (0) +#define MYSQL_KEYCACHE_READ_BLOCK(arg0) +#define MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (0) +#define MYSQL_KEYCACHE_READ_HIT() +#define MYSQL_KEYCACHE_READ_HIT_ENABLED() (0) +#define MYSQL_KEYCACHE_READ_MISS() +#define MYSQL_KEYCACHE_READ_MISS_ENABLED() (0) +#define MYSQL_KEYCACHE_READ_DONE(arg0, arg1) +#define MYSQL_KEYCACHE_READ_DONE_ENABLED() (0) +#define MYSQL_KEYCACHE_WRITE_START(arg0, arg1, arg2, arg3) +#define MYSQL_KEYCACHE_WRITE_START_ENABLED() (0) +#define MYSQL_KEYCACHE_WRITE_BLOCK(arg0) +#define MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (0) +#define MYSQL_KEYCACHE_WRITE_DONE(arg0, arg1) +#define MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (0) + +#ifdef __cplusplus +} +#endif + +#endif /* _PROBES_MYSQL_D */ --===============9060682096214869716== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # paispu2pwstvjwdh # target_branch: file:///export/home/didrik/repo/trunk/ # testament_sha1: ff4ac95e1e06568ffe9825489fee6266ef88814c # timestamp: 2011-05-12 15:24:14 +0200 # source_branch: file:///export/home/didrik/repo/5.5/ # base_revision_id: tatjana.nuernberg@stripped\ # 8tt9kods36wupmsx # # Begin bundle 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 --===============9060682096214869716==--