diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-02 01:48:43 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-02 01:48:43 +0100 |
| commit | 55d6d04df0e93a446ee592d71689bedb16189478 (patch) | |
| tree | 2cc4962b85af835d461cb0c5c5759ff69ea5b687 /include | |
| parent | 3900e55aa8a1242a78861536c0c6454d90d7cdb0 (diff) | |
| parent | 31d4e58ad4c26fea1367ddb00ea0c26a17d3ddfc (diff) | |
| download | mariadb-git-55d6d04df0e93a446ee592d71689bedb16189478.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31177/50-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 981111b8718..c26d0fb9260 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -219,6 +219,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 dcd6ad9d79b..f5688a37231 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -67,7 +67,8 @@ extern void my_print_variables(const struct my_option *options); extern void my_getopt_register_get_addr(gptr* (*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 |