diff options
Diffstat (limited to 'sql/opt_trace.cc')
| -rw-r--r-- | sql/opt_trace.cc | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sql/opt_trace.cc b/sql/opt_trace.cc index 9957e524e90..ddec6d5ed2d 100644 --- a/sql/opt_trace.cc +++ b/sql/opt_trace.cc @@ -17,7 +17,7 @@ #include "sql_class.h" #include "sql_show.h" #include "field.h" -#include "table.h" +#include "sql_i_s.h" #include "opt_trace.h" #include "sql_parse.h" #include "set_var.h" @@ -68,18 +68,21 @@ bool sets_var_optimizer_trace(enum enum_sql_command sql_command, } +namespace Show { + + ST_FIELD_INFO optimizer_trace_info[]= { - /* name, length, type, value, maybe_null, old_name, open_method */ - {"QUERY", 65535, MYSQL_TYPE_STRING, 0, false, NULL, SKIP_OPEN_TABLE}, - {"TRACE", 65535, MYSQL_TYPE_STRING, 0, false, NULL, SKIP_OPEN_TABLE}, - {"MISSING_BYTES_BEYOND_MAX_MEM_SIZE", 20, MYSQL_TYPE_LONG, 0, false, NULL, - SKIP_OPEN_TABLE}, - {"INSUFFICIENT_PRIVILEGES", 1, MYSQL_TYPE_TINY, 0, false, NULL, - SKIP_OPEN_TABLE}, - {NULL, 0, MYSQL_TYPE_STRING, 0, true, NULL, 0} + Column("QUERY", Longtext(65535), NOT_NULL), + Column("TRACE", Longtext(65535), NOT_NULL), + Column("MISSING_BYTES_BEYOND_MAX_MEM_SIZE", SLong(20), NOT_NULL), + Column("INSUFFICIENT_PRIVILEGES", STiny(1), NOT_NULL), + CEnd() }; +} // namespace Show + + /* TODO: one-line needs to be implemented seperately */ @@ -260,7 +263,7 @@ void opt_trace_disable_if_no_tables_access(THD *thd, TABLE_LIST *tbl) bool rc = check_table_access(thd, SELECT_ACL, t, false, 1, true) || // (1) - ((t->grant.privilege & SELECT_ACL) == 0); // (2) + ((t->grant.privilege & SELECT_ACL) == NO_ACL); // (2) if (t->is_view()) { /* @@ -414,7 +417,7 @@ bool Opt_trace_context::is_enabled() return false; } -Opt_trace_context::Opt_trace_context() +Opt_trace_context::Opt_trace_context() : traces(PSI_INSTRUMENT_MEM) { current_trace= NULL; max_mem_size= 0; |