diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 03:19:07 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 03:19:07 +0100 |
| commit | 70cb41a240268ace3d6a8a75c28b7d9ae2a04079 (patch) | |
| tree | 9c97f7a03204559208c97b73dfdb1d270657c44a /include | |
| parent | 25886c069e8aa9828396f92d2028c983147bdf75 (diff) | |
| parent | 58f10e554aa2ce340e853be1006e1f411f89f09d (diff) | |
| download | mariadb-git-70cb41a240268ace3d6a8a75c28b7d9ae2a04079.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31177/51-31177
client/mysql.cc:
Auto merged
mysql-test/r/index_merge_myisam.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 1 | ||||
| -rw-r--r-- | include/my_getopt.h | 4 |
2 files changed, 4 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..14f8e6df95b 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -74,7 +74,9 @@ 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 *fix); +longlong getopt_ll_limit_value(longlong, const struct my_option *,bool *fix); my_bool getopt_compare_strings(const char *s, const char *t, uint length); C_MODE_END |