From: Tor Didriksen Date: May 12 2011 1:33pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3371) List-Archive: http://lists.mysql.com/commits/137225 Message-Id: <20110512133348.3C0863793@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7601654212796419889==" --===============7601654212796419889== 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-repair/ based on revid:tatjana.nuernberg@stripped 3371 Tor Didriksen 2011-05-12 revert -r 3368 include/probes_mysql_nodtrace.h 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:33:42 +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 */ --===============7601654212796419889== 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\ # bquw30l0rx2yozsi # target_branch: file:///export/home/didrik/repo/trunk-repair/ # testament_sha1: d3e9eed7139a890958a19bae63ee7a5336b0efb0 # timestamp: 2011-05-12 15:33:48 +0200 # base_revision_id: tatjana.nuernberg@stripped\ # 8tt9kods36wupmsx # # Begin bundle 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 --===============7601654212796419889==--