diff options
| author | unknown <kaa@polly.local> | 2007-05-28 14:30:28 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-28 14:30:28 +0400 |
| commit | e5a94b2ba0aadb5b588e05861dc2f784ca8b3292 (patch) | |
| tree | ba92e9ae6c1163fa6107a28cdc394689ea8867de /sql/mysqld.cc | |
| parent | 7e96711aaf1467dbb01472dcb7f5e264f1a9f26e (diff) | |
| parent | ba442f4b81234621b227fee25de2d7d59a660438 (diff) | |
| download | mariadb-git-e5a94b2ba0aadb5b588e05861dc2f784ca8b3292.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
strings/strtod.c:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 672ae570c5b..9f53e3d1a58 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -462,8 +462,6 @@ ulong expire_logs_days = 0; ulong rpl_recovery_rank=0; const char *log_output_str= "TABLE"; -double log_10[32]; /* 10 potences */ -double log_01[32]; time_t server_start_time; char mysql_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30]; |