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/mysql_priv.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/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 0aaa1744fe1..1ce8822cb6f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -193,6 +193,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 @@ -360,6 +362,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) + /* @@ -562,6 +566,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 @@ -1245,7 +1251,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)]; |