diff options
| author | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
| commit | 598b7631cd2fccf315ca28cc372d07a2a5c8ecbb (patch) | |
| tree | aa1d5fa63a6ba1a39d06e35d826b5a7407facfb5 /sql/mysql_priv.h | |
| parent | e3beea23a0f202866c293947a74fc6df092e5763 (diff) | |
| parent | 48e0630d2f71b47a12ef85124bba570d73ff7b65 (diff) | |
| download | mariadb-git-598b7631cd2fccf315ca28cc372d07a2a5c8ecbb.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 5d11a047a8f..b333660059e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1059,7 +1059,6 @@ extern char language[FN_REFLEN], reg_ext[FN_EXTLEN]; 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 last_query_cost; extern double log_10[32]; extern ulonglong log_10_int[20]; extern ulonglong keybuff_size; |