diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
| commit | cf74e43f1583a81016f0ce6cbbe087b38853b5cd (patch) | |
| tree | 778fee9432c6a68f033c652aa8b4d32b49a0e4f3 /sql/sql_class.h | |
| parent | f4b671d8bc1ab80342918820a2bc841c5542d57d (diff) | |
| parent | 1f1d673200b312b85739f455c74c25c399f1cc93 (diff) | |
| download | mariadb-git-cf74e43f1583a81016f0ce6cbbe087b38853b5cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4fac86dc405..2aeae0d7748 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -534,6 +534,7 @@ struct system_variables ulong optimizer_prune_level; ulong optimizer_search_depth; ulong preload_buff_size; + ulong profiling_history_size; ulong query_cache_type; ulong read_buff_size; ulong read_rnd_buff_size; @@ -1235,6 +1236,9 @@ public: Points to info-string that we show in SHOW PROCESSLIST You are supposed to update thd->proc_info only if you have coded a time-consuming piece that MySQL can get stuck in for a long time. + + Set it using the thd_proc_info(THD *thread, const char *message) + macro/function. */ const char *proc_info; @@ -1389,6 +1393,10 @@ public: List <MYSQL_ERROR> warn_list; uint warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_END]; uint total_warn_count; +#ifdef ENABLED_PROFILING + PROFILING profiling; +#endif + /* Id of current query. Statement can be reused to execute several queries query_id is global in context of the whole MySQL server. |