diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-01 15:53:56 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-01 15:53:56 +0100 |
| commit | 9598ea4f45d2dfd7282111b35ca261f788d6ae72 (patch) | |
| tree | 84d18e52bd97b323fa4ba6bb3915a25c2239ab6f /include | |
| parent | 69ed192e7277556f4e2ca487967322be7fe7edf7 (diff) | |
| parent | 31d4e58ad4c26fea1367ddb00ea0c26a17d3ddfc (diff) | |
| download | mariadb-git-9598ea4f45d2dfd7282111b35ca261f788d6ae72.tar.gz | |
Merge mysql.com:/misc/mysql/31177/50-31177
into mysql.com:/misc/mysql/31177/51-31177
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 1 | ||||
| -rw-r--r-- | include/my_getopt.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 00fb4cb0656..9d2a30917bd 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -200,6 +200,7 @@ double my_strtod(const char *str, char **end, int *error); double my_atof(const char *nptr); extern char *llstr(longlong value,char *buff); +extern char *ullstr(longlong value,char *buff); #ifndef HAVE_STRTOUL extern long strtol(const char *str, char **ptr, int base); extern ulong strtoul(const char *str, char **ptr, int base); diff --git a/include/my_getopt.h b/include/my_getopt.h index 30c2eb9531a..c0101fd4cdb 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -74,7 +74,8 @@ extern void my_print_variables(const struct my_option *options); extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint, const struct my_option *)); -ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp); +ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, + bool *fixed); my_bool getopt_compare_strings(const char *s, const char *t, uint length); C_MODE_END |