diff options
author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-01-31 14:31:11 +0400 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-01-31 14:31:11 +0400 |
commit | 1bcc167053a88b46f9c8dafbad0bb2e584acf289 (patch) | |
tree | b4e0d9edcc581bb4acc1f697ed311c5e52245be0 /sql/mysql_priv.h | |
parent | 29617cad4182c5e95255db90767f83249d1e94e5 (diff) | |
parent | abf7eb0627d1a652beaa2380dbb94c6ad0ae0a2a (diff) | |
download | mariadb-git-1bcc167053a88b46f9c8dafbad0bb2e584acf289.tar.gz |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b19690/b19690.5.0
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 8295f247835..4c0554719ed 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1218,6 +1218,7 @@ extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN]; extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file; extern char log_error_file[FN_REFLEN], *opt_tc_log_file; extern double log_10[32]; +extern double log_01[32]; extern ulonglong log_10_int[20]; extern ulonglong keybuff_size; extern ulonglong thd_startup_options; |