diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-04-03 09:20:22 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-04-03 09:20:22 -0400 |
| commit | 5f4dfdd5fe70992a928655c0330d45475086eacb (patch) | |
| tree | 7fa50722c085b9530bfa933fd31afeef374b4a05 /sql/mysql_priv.h | |
| parent | 30d5fbe5b1633ba298568cbb843600ea96a3a8ee (diff) | |
| parent | d2566405841b1c3f41ce054766374f96369203cd (diff) | |
| download | mariadb-git-5f4dfdd5fe70992a928655c0330d45475086eacb.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/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 8d6ca4318e3..119e1c1e8ee 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 @@ -1237,7 +1243,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)]; |