summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-07-15 14:08:14 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-07-15 14:08:14 +0200
commit93915d0d50c8024f2a9fce766893df285fdf1eb7 (patch)
treeefcb5cf4b52e64d01e8e24844ba776ab68a5a532 /include/m_string.h
parent08ecbd5adb9051b77dca4cea0988ea286366a409 (diff)
parentcfcd49b467dc5de004310db1ff0810842ea3bb56 (diff)
downloadmariadb-git-93915d0d50c8024f2a9fce766893df285fdf1eb7.tar.gz
merge 5.0-security => 5.1-security
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 0e0090f52e6..e1cf7651519 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -179,6 +179,15 @@ extern int is_prefix(const char *, const char *);
double my_strtod(const char *str, char **end, int *error);
double my_atof(const char *nptr);
+#ifndef NOT_FIXED_DEC
+#define NOT_FIXED_DEC 31
+#endif
+
+/*
+ Max length of a floating point number.
+ */
+#define FLOATING_POINT_BUFFER (311 + NOT_FIXED_DEC)
+
extern char *llstr(longlong value,char *buff);
extern char *ullstr(longlong value,char *buff);
#ifndef HAVE_STRTOUL