diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-07-02 10:46:46 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-07-02 10:46:46 -0400 |
| commit | 681ee9694bc0d6203ffdd5175a2b6e7e77fc41d4 (patch) | |
| tree | ad2a11ebcf9c63780cf2788f9469dee1d50cd9c7 /sql/sql_class.h | |
| parent | c4b53b218c71aff3410ec4358dfec2b9d0e1e1b4 (diff) | |
| parent | 01f572052d0d50a06745d5b6d96e20db81530d7b (diff) | |
| download | mariadb-git-681ee9694bc0d6203ffdd5175a2b6e7e77fc41d4.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
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 50c45d461e0..3061ac7ddc7 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; @@ -1215,6 +1216,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; @@ -1369,6 +1373,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. |