diff options
| author | unknown <kaa@polly.local> | 2007-05-28 12:52:05 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-28 12:52:05 +0400 |
| commit | 71e78d16ff2638affa7864ae2fcc8a0efdb1b9e9 (patch) | |
| tree | 4fea6fd04847e73e6e9f52860ac3c3f54de6f0c2 /include/m_string.h | |
| parent | 55153730b2aadba899284b2862647edefaa44757 (diff) | |
| parent | e3af3c2127132e327ea8dd21d942ef2e09d7f4d6 (diff) | |
| download | mariadb-git-71e78d16ff2638affa7864ae2fcc8a0efdb1b9e9.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
include/m_string.h:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/init.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/field.cc:
Manual merge.
sql/field.h:
Manual merge.
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h index 4f098c3206d..5283061a5c0 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -92,6 +92,10 @@ extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ 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]; + #ifdef BAD_STRING_COMPILER #define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1) #else |