diff options
| author | unknown <kaa@polly.local> | 2007-05-28 15:36:19 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-28 15:36:19 +0400 |
| commit | 7f6f6d09c7e8a7d1b3aa618332d3495b9f3dd62a (patch) | |
| tree | 3bdc86d4fe83649eaf4f5e084fa747915b3fde5a /include/m_string.h | |
| parent | e5a94b2ba0aadb5b588e05861dc2f784ca8b3292 (diff) | |
| parent | 088cb9ddc41b7dfb8d6ff3c92d949c326dcaabb1 (diff) | |
| download | mariadb-git-7f6f6d09c7e8a7d1b3aa618332d3495b9f3dd62a.tar.gz | |
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
include/m_string.h:
Auto merged
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 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h index 5283061a5c0..f6b8d8f6689 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -93,8 +93,8 @@ extern char NEAR _dig_vec_upper[]; extern char NEAR _dig_vec_lower[]; /* Defined in strtod.c */ -extern const double log_10[310]; -extern const double log_01[310]; +extern const double log_10[309]; +extern const double log_01[309]; #ifdef BAD_STRING_COMPILER #define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1) |