Below is the list of changes that have just been committed into a local
6.0 repository of brian. When brian does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-07 18:31:13-07:00, brian@stripped +8 -0
filesort.cc:
Extended dtrace probes.
Many files:
Extended dtrace probes.
sql/filesort.cc@stripped, 2008-04-07 18:29:48-07:00, brian@stripped +1 -1
Extended dtrace probes.
sql/handler.cc@stripped, 2008-04-07 18:30:06-07:00, brian@stripped +1 -1
Extended dtrace probes.
sql/probes.d@stripped, 2008-04-07 18:30:08-07:00, brian@stripped +10 -10
Extended dtrace probes.
sql/probes.h@stripped, 2008-04-07 18:30:10-07:00, brian@stripped +64 -64
Extended dtrace probes.
sql/sql_delete.cc@stripped, 2008-04-07 18:30:11-07:00, brian@stripped +30 -4
Extended dtrace probes.
sql/sql_insert.cc@stripped, 2008-04-07 18:30:12-07:00, brian@stripped +17 -2
Extended dtrace probes.
sql/sql_select.cc@stripped, 2008-04-07 18:30:14-07:00, brian@stripped +11 -2
Extended dtrace probes.
sql/sql_update.cc@stripped, 2008-04-07 18:30:16-07:00, brian@stripped +43 -6
Extended dtrace probes.
diff -Nrup a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc 2008-03-14 15:19:49 -07:00
+++ b/sql/filesort.cc 2008-04-07 18:29:48 -07:00
@@ -333,7 +333,7 @@ ha_rows filesort(THD *thd, TABLE *table,
#endif
memcpy(&table->sort, &table_sort, sizeof(FILESORT_INFO));
DBUG_PRINT("exit",("records: %ld", (long) records));
- MYSQL_FILESORT_END();
+ MYSQL_FILESORT_FINISH();
DBUG_RETURN(error ? HA_POS_ERROR : records);
} /* filesort */
diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc 2008-04-01 06:44:51 -07:00
+++ b/sql/handler.cc 2008-04-07 18:30:06 -07:00
@@ -5309,7 +5309,7 @@ int handler::ha_write_row(uchar *buf)
DBUG_RETURN(error);
if (unlikely(error= binlog_log_row(table, 0, buf, log_func)))
DBUG_RETURN(error); /* purecov: inspected */
- MYSQL_INSERT_ROW_END();
+ MYSQL_INSERT_ROW_FINISH();
DBUG_RETURN(0);
}
diff -Nrup a/sql/probes.d b/sql/probes.d
--- a/sql/probes.d 2007-09-21 00:07:19 -07:00
+++ b/sql/probes.d 2008-04-07 18:30:08 -07:00
@@ -16,15 +16,15 @@
provider mysql {
probe external_lock(int);
probe insert_row_start();
-probe insert_row_end();
+probe insert_row_finish();
probe filesort_start();
-probe filesort_end();
-probe delete_start();
-probe delete_end();
-probe insert_start();
-probe insert_end();
-probe select_start();
-probe select_end();
-probe update_start();
-probe update_end();
+probe filesort_finish();
+probe delete_start(int, char *, char *, char *, char *);
+probe delete_finish(int, char *, char *, char *, char *, long);
+probe insert_start(int, char *, char *, char *, char *);
+probe insert_finish(int, char *, char *, char *, char *, long);
+probe select_start(int, char *, char *, char *, char *);
+probe select_finish(int, char *, char *, char *, char *, long);
+probe update_start(int, char *, char *, char *, char *);
+probe update_finish(int, char *, char *, char *, char *, ulong, ulong);
};
diff -Nrup a/sql/probes.h b/sql/probes.h
--- a/sql/probes.h 2007-09-21 00:07:23 -07:00
+++ b/sql/probes.h 2008-04-07 18:30:10 -07:00
@@ -13,114 +13,114 @@ extern "C" {
#if _DTRACE_VERSION
-#define MYSQL_DELETE_END() \
- __dtrace_mysql___delete_end()
-#define MYSQL_DELETE_END_ENABLED() \
- __dtraceenabled_mysql___delete_end()
-#define MYSQL_DELETE_START() \
- __dtrace_mysql___delete_start()
+#define MYSQL_DELETE_FINISH(arg0, arg1, arg2, arg3, arg4, arg5) \
+ __dtrace_mysql___delete_finish(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_DELETE_FINISH_ENABLED() \
+ __dtraceenabled_mysql___delete_finish()
+#define MYSQL_DELETE_START(arg0, arg1, arg2, arg3, arg4) \
+ __dtrace_mysql___delete_start(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_DELETE_START_ENABLED() \
__dtraceenabled_mysql___delete_start()
#define MYSQL_EXTERNAL_LOCK(arg0) \
__dtrace_mysql___external_lock(arg0)
#define MYSQL_EXTERNAL_LOCK_ENABLED() \
__dtraceenabled_mysql___external_lock()
-#define MYSQL_FILESORT_END() \
- __dtrace_mysql___filesort_end()
-#define MYSQL_FILESORT_END_ENABLED() \
- __dtraceenabled_mysql___filesort_end()
+#define MYSQL_FILESORT_FINISH() \
+ __dtrace_mysql___filesort_finish()
+#define MYSQL_FILESORT_FINISH_ENABLED() \
+ __dtraceenabled_mysql___filesort_finish()
#define MYSQL_FILESORT_START() \
__dtrace_mysql___filesort_start()
#define MYSQL_FILESORT_START_ENABLED() \
__dtraceenabled_mysql___filesort_start()
-#define MYSQL_INSERT_END() \
- __dtrace_mysql___insert_end()
-#define MYSQL_INSERT_END_ENABLED() \
- __dtraceenabled_mysql___insert_end()
-#define MYSQL_INSERT_ROW_END() \
- __dtrace_mysql___insert_row_end()
-#define MYSQL_INSERT_ROW_END_ENABLED() \
- __dtraceenabled_mysql___insert_row_end()
+#define MYSQL_INSERT_FINISH(arg0, arg1, arg2, arg3, arg4, arg5) \
+ __dtrace_mysql___insert_finish(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_INSERT_FINISH_ENABLED() \
+ __dtraceenabled_mysql___insert_finish()
+#define MYSQL_INSERT_ROW_FINISH() \
+ __dtrace_mysql___insert_row_finish()
+#define MYSQL_INSERT_ROW_FINISH_ENABLED() \
+ __dtraceenabled_mysql___insert_row_finish()
#define MYSQL_INSERT_ROW_START() \
__dtrace_mysql___insert_row_start()
#define MYSQL_INSERT_ROW_START_ENABLED() \
__dtraceenabled_mysql___insert_row_start()
-#define MYSQL_INSERT_START() \
- __dtrace_mysql___insert_start()
+#define MYSQL_INSERT_START(arg0, arg1, arg2, arg3, arg4) \
+ __dtrace_mysql___insert_start(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_INSERT_START_ENABLED() \
__dtraceenabled_mysql___insert_start()
-#define MYSQL_SELECT_END() \
- __dtrace_mysql___select_end()
-#define MYSQL_SELECT_END_ENABLED() \
- __dtraceenabled_mysql___select_end()
-#define MYSQL_SELECT_START() \
- __dtrace_mysql___select_start()
+#define MYSQL_SELECT_FINISH(arg0, arg1, arg2, arg3, arg4, arg5) \
+ __dtrace_mysql___select_finish(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_SELECT_FINISH_ENABLED() \
+ __dtraceenabled_mysql___select_finish()
+#define MYSQL_SELECT_START(arg0, arg1, arg2, arg3, arg4) \
+ __dtrace_mysql___select_start(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_SELECT_START_ENABLED() \
__dtraceenabled_mysql___select_start()
-#define MYSQL_UPDATE_END() \
- __dtrace_mysql___update_end()
-#define MYSQL_UPDATE_END_ENABLED() \
- __dtraceenabled_mysql___update_end()
-#define MYSQL_UPDATE_START() \
- __dtrace_mysql___update_start()
+#define MYSQL_UPDATE_FINISH(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
+ __dtrace_mysql___update_finish(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+#define MYSQL_UPDATE_FINISH_ENABLED() \
+ __dtraceenabled_mysql___update_finish()
+#define MYSQL_UPDATE_START(arg0, arg1, arg2, arg3, arg4) \
+ __dtrace_mysql___update_start(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_UPDATE_START_ENABLED() \
__dtraceenabled_mysql___update_start()
-extern void __dtrace_mysql___delete_end(void);
-extern int __dtraceenabled_mysql___delete_end(void);
-extern void __dtrace_mysql___delete_start(void);
+extern void __dtrace_mysql___delete_finish(int, char *, char *, char *, char *, long);
+extern int __dtraceenabled_mysql___delete_finish(void);
+extern void __dtrace_mysql___delete_start(int, char *, char *, char *, char *);
extern int __dtraceenabled_mysql___delete_start(void);
extern void __dtrace_mysql___external_lock(int);
extern int __dtraceenabled_mysql___external_lock(void);
-extern void __dtrace_mysql___filesort_end(void);
-extern int __dtraceenabled_mysql___filesort_end(void);
+extern void __dtrace_mysql___filesort_finish(void);
+extern int __dtraceenabled_mysql___filesort_finish(void);
extern void __dtrace_mysql___filesort_start(void);
extern int __dtraceenabled_mysql___filesort_start(void);
-extern void __dtrace_mysql___insert_end(void);
-extern int __dtraceenabled_mysql___insert_end(void);
-extern void __dtrace_mysql___insert_row_end(void);
-extern int __dtraceenabled_mysql___insert_row_end(void);
+extern void __dtrace_mysql___insert_finish(int, char *, char *, char *, char *, long);
+extern int __dtraceenabled_mysql___insert_finish(void);
+extern void __dtrace_mysql___insert_row_finish(void);
+extern int __dtraceenabled_mysql___insert_row_finish(void);
extern void __dtrace_mysql___insert_row_start(void);
extern int __dtraceenabled_mysql___insert_row_start(void);
-extern void __dtrace_mysql___insert_start(void);
+extern void __dtrace_mysql___insert_start(int, char *, char *, char *, char *);
extern int __dtraceenabled_mysql___insert_start(void);
-extern void __dtrace_mysql___select_end(void);
-extern int __dtraceenabled_mysql___select_end(void);
-extern void __dtrace_mysql___select_start(void);
+extern void __dtrace_mysql___select_finish(int, char *, char *, char *, char *, long);
+extern int __dtraceenabled_mysql___select_finish(void);
+extern void __dtrace_mysql___select_start(int, char *, char *, char *, char *);
extern int __dtraceenabled_mysql___select_start(void);
-extern void __dtrace_mysql___update_end(void);
-extern int __dtraceenabled_mysql___update_end(void);
-extern void __dtrace_mysql___update_start(void);
+extern void __dtrace_mysql___update_finish(int, char *, char *, char *, char *, ulong, ulong);
+extern int __dtraceenabled_mysql___update_finish(void);
+extern void __dtrace_mysql___update_start(int, char *, char *, char *, char *);
extern int __dtraceenabled_mysql___update_start(void);
#else
-#define MYSQL_DELETE_END()
-#define MYSQL_DELETE_END_ENABLED() (0)
-#define MYSQL_DELETE_START()
+#define MYSQL_DELETE_FINISH(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_DELETE_FINISH_ENABLED() (0)
+#define MYSQL_DELETE_START(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_DELETE_START_ENABLED() (0)
#define MYSQL_EXTERNAL_LOCK(arg0)
#define MYSQL_EXTERNAL_LOCK_ENABLED() (0)
-#define MYSQL_FILESORT_END()
-#define MYSQL_FILESORT_END_ENABLED() (0)
+#define MYSQL_FILESORT_FINISH()
+#define MYSQL_FILESORT_FINISH_ENABLED() (0)
#define MYSQL_FILESORT_START()
#define MYSQL_FILESORT_START_ENABLED() (0)
-#define MYSQL_INSERT_END()
-#define MYSQL_INSERT_END_ENABLED() (0)
-#define MYSQL_INSERT_ROW_END()
-#define MYSQL_INSERT_ROW_END_ENABLED() (0)
+#define MYSQL_INSERT_FINISH(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_INSERT_FINISH_ENABLED() (0)
+#define MYSQL_INSERT_ROW_FINISH()
+#define MYSQL_INSERT_ROW_FINISH_ENABLED() (0)
#define MYSQL_INSERT_ROW_START()
#define MYSQL_INSERT_ROW_START_ENABLED() (0)
-#define MYSQL_INSERT_START()
+#define MYSQL_INSERT_START(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_INSERT_START_ENABLED() (0)
-#define MYSQL_SELECT_END()
-#define MYSQL_SELECT_END_ENABLED() (0)
-#define MYSQL_SELECT_START()
+#define MYSQL_SELECT_FINISH(arg0, arg1, arg2, arg3, arg4, arg5)
+#define MYSQL_SELECT_FINISH_ENABLED() (0)
+#define MYSQL_SELECT_START(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_SELECT_START_ENABLED() (0)
-#define MYSQL_UPDATE_END()
-#define MYSQL_UPDATE_END_ENABLED() (0)
-#define MYSQL_UPDATE_START()
+#define MYSQL_UPDATE_FINISH(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+#define MYSQL_UPDATE_FINISH_ENABLED() (0)
+#define MYSQL_UPDATE_START(arg0, arg1, arg2, arg3, arg4)
#define MYSQL_UPDATE_START_ENABLED() (0)
#endif
diff -Nrup a/sql/sql_delete.cc b/sql/sql_delete.cc
--- a/sql/sql_delete.cc 2008-03-28 07:49:08 -07:00
+++ b/sql/sql_delete.cc 2008-04-07 18:30:11 -07:00
@@ -52,6 +52,12 @@ bool mysql_delete(THD *thd, TABLE_LIST *
THD::killed_state killed_status= THD::NOT_KILLED;
DBUG_ENTER("mysql_delete");
+ MYSQL_DELETE_START(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db);
+
if (open_and_lock_tables(thd, table_list))
DBUG_RETURN(TRUE);
if (!(table= table_list->table))
@@ -161,7 +167,12 @@ bool mysql_delete(THD *thd, TABLE_LIST *
{
free_underlaid_joins(thd, select_lex);
thd->row_count_func= 0;
- MYSQL_DELETE_END();
+ MYSQL_DELETE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0);
my_ok(thd, (ha_rows) thd->row_count_func); // No matching records
DBUG_RETURN(0);
}
@@ -179,7 +190,12 @@ bool mysql_delete(THD *thd, TABLE_LIST *
delete select;
free_underlaid_joins(thd, select_lex);
thd->row_count_func= 0;
- MYSQL_DELETE_END();
+ MYSQL_DELETE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0);
my_ok(thd, (ha_rows) thd->row_count_func);
/*
We don't need to call reset_auto_increment in this case, because
@@ -408,7 +424,12 @@ cleanup:
BACKUP_BREAKPOINT("backup_commit_blocker");
}
- MYSQL_DELETE_END();
+ MYSQL_DELETE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ deleted);
if (error < 0 || (thd->lex->ignore && !thd->is_fatal_error))
{
thd->row_count_func= deleted;
@@ -418,7 +439,12 @@ cleanup:
DBUG_RETURN(error >= 0 || thd->is_error());
err:
- MYSQL_DELETE_END();
+ MYSQL_DELETE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ -1);
DBUG_RETURN(TRUE);
}
diff -Nrup a/sql/sql_insert.cc b/sql/sql_insert.cc
--- a/sql/sql_insert.cc 2008-04-01 06:44:54 -07:00
+++ b/sql/sql_insert.cc 2008-04-07 18:30:12 -07:00
@@ -583,6 +583,11 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
thr_lock_type lock_type;
Item *unused_conds= 0;
DBUG_ENTER("mysql_insert");
+ MYSQL_INSERT_START(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db);
/*
Upgrade lock type if the requested lock is incompatible with
@@ -977,7 +982,12 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
::my_ok(thd, (ulong) thd->row_count_func, id, buff);
}
thd->abort_on_warning= 0;
- MYSQL_INSERT_END();
+ MYSQL_INSERT_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ thd->row_count_func);
DBUG_RETURN(FALSE);
abort:
@@ -990,7 +1000,12 @@ abort:
if (!joins_freed)
free_underlaid_joins(thd, &thd->lex->select_lex);
thd->abort_on_warning= 0;
- MYSQL_INSERT_END();
+ MYSQL_INSERT_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0);
DBUG_RETURN(TRUE);
}
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc 2008-04-02 02:33:18 -07:00
+++ b/sql/sql_select.cc 2008-04-07 18:30:14 -07:00
@@ -259,7 +259,11 @@ bool handle_select(THD *thd, LEX *lex, s
bool res;
register SELECT_LEX *select_lex = &lex->select_lex;
DBUG_ENTER("handle_select");
- MYSQL_SELECT_START();
+ MYSQL_SELECT_START(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db);
if (select_lex->master_unit()->is_union() ||
select_lex->master_unit()->fake_select_lex)
@@ -294,7 +298,12 @@ bool handle_select(THD *thd, LEX *lex, s
if (unlikely(res))
result->abort();
- MYSQL_SELECT_END();
+ MYSQL_SELECT_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ thd->sent_row_count);
DBUG_RETURN(res);
}
diff -Nrup a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc 2008-03-28 07:49:09 -07:00
+++ b/sql/sql_update.cc 2008-04-07 18:30:16 -07:00
@@ -232,7 +232,12 @@ int mysql_update(THD *thd,
mysql_handle_derived(thd->lex, &mysql_derived_filling)))
DBUG_RETURN(1);
- MYSQL_UPDATE_START();
+ MYSQL_UPDATE_START(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db);
+
thd_proc_info(thd, "init");
table= table_list->table;
@@ -292,7 +297,13 @@ int mysql_update(THD *thd,
if (select_lex->inner_refs_list.elements &&
fix_inner_refs(thd, all_fields, select_lex, select_lex->ref_pointer_array))
{
- MYSQL_UPDATE_END();
+ MYSQL_UPDATE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0,
+ 0);
DBUG_RETURN(-1);
}
@@ -321,7 +332,13 @@ int mysql_update(THD *thd,
if (prune_partitions(thd, table, conds))
{
free_underlaid_joins(thd, select_lex);
- MYSQL_UPDATE_END();
+ MYSQL_UPDATE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0,
+ 0);
my_ok(thd); // No matching records
DBUG_RETURN(0);
}
@@ -337,7 +354,13 @@ int mysql_update(THD *thd,
free_underlaid_joins(thd, select_lex);
if (error)
goto abort; // Error in where
- MYSQL_UPDATE_END();
+ MYSQL_UPDATE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0,
+ 0);
my_ok(thd); // No matching records
DBUG_RETURN(0);
}
@@ -810,7 +833,14 @@ int mysql_update(THD *thd,
id= thd->arg_of_last_insert_id_function ?
thd->first_successful_insert_id_in_prev_stmt : 0;
- MYSQL_UPDATE_END();
+ MYSQL_UPDATE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ found,
+ updated);
+
if (error < 0)
{
char buff[STRING_BUFFER_USUAL_SIZE];
@@ -820,6 +850,7 @@ int mysql_update(THD *thd,
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
my_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_PRINT("info",("%ld records updated", (long) updated));
+
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */
thd->abort_on_warning= 0;
@@ -836,7 +867,13 @@ err:
thd->abort_on_warning= 0;
abort:
- MYSQL_UPDATE_END();
+ MYSQL_UPDATE_FINISH(thd->thread_id,
+ thd->query,
+ (char *)thd->security_ctx->priv_user,
+ (char *)thd->security_ctx->host_or_ip,
+ thd->db,
+ 0,
+ 0);
DBUG_RETURN(1);
}
| Thread |
|---|
| • bk commit into 6.0 tree (brian:1.2627) | Brian Aker | 8 Apr |
