diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-04-26 11:51:37 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-04-26 11:51:37 -0400 |
| commit | c9cbc1e7f3e2b092b4ceee1a053f98bb167e9030 (patch) | |
| tree | eb53ce8e1bbaa9420298b4d71fd9100db7d63374 /sql/mysql_priv.h | |
| parent | 75c31f6bb9d257e3b3d19e9f4798f08af1df1158 (diff) | |
| parent | bbd8b850cd61b1326849c45153a2a0c694cb12b1 (diff) | |
| download | mariadb-git-c9cbc1e7f3e2b092b4ceee1a053f98bb167e9030.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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 39f115f6fd5..7fabfe8ee12 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -195,6 +195,8 @@ MY_LOCALE *my_locale_by_number(uint number); #define BDB_LOG_ALLOC_BLOCK_SIZE 1024 #define WARN_ALLOC_BLOCK_SIZE 2048 #define WARN_ALLOC_PREALLOC_SIZE 1024 +#define PROFILE_ALLOC_BLOCK_SIZE 2048 +#define PROFILE_ALLOC_PREALLOC_SIZE 1024 /* The following parameters is to decide when to use an extra cache to @@ -367,6 +369,8 @@ MY_LOCALE *my_locale_by_number(uint number); fulltext functions when reading from it. */ #define TMP_TABLE_FORCE_MYISAM (ULL(1) << 32) +#define OPTION_PROFILING (ULL(1) << 33) + /* @@ -569,6 +573,8 @@ typedef my_bool (*qc_engine_callback)(THD *thd, char *table_key, #include "field.h" /* Field definitions */ #include "protocol.h" #include "sql_udf.h" +#include "sql_profile.h" + class user_var_entry; class Security_context; enum enum_var_type @@ -1240,7 +1246,7 @@ void my_dbopt_free(void); External variables */ -extern time_t server_start_time; +extern time_t server_start_time, flush_status_time; extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[], def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; |