diff options
author | unknown <kaa@polly.local> | 2007-05-31 12:21:21 +0400 |
---|---|---|
committer | unknown <kaa@polly.local> | 2007-05-31 12:21:21 +0400 |
commit | 2c9f2ebb60cc0249f0e450690200789b8007a2b9 (patch) | |
tree | a7698a5fcf1383f3c9914828149de5042efc2417 /include/m_string.h | |
parent | a7490c4da833da6a9034d62796d1f64f197e028f (diff) | |
parent | 9dc7a7b8344335b03a2162abcc7c1a61fa21fc1d (diff) | |
download | mariadb-git-2c9f2ebb60cc0249f0e450690200789b8007a2b9.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
sql/item_cmpfunc.cc:
Auto merged
strings/strtod.c:
Auto merged
Diffstat (limited to 'include/m_string.h')
-rw-r--r-- | include/m_string.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index f6b8d8f6689..34d2cdac92b 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -94,7 +94,6 @@ extern char NEAR _dig_vec_lower[]; /* Defined in strtod.c */ 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) |