diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 15:53:56 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 15:53:56 +0100 |
| commit | ae789bd65a6b8a3c5480ce0759e966e8479225f7 (patch) | |
| tree | 84d18e52bd97b323fa4ba6bb3915a25c2239ab6f /include | |
| parent | d56fa51b57f609f83fb7985215f530e11ac6d6d4 (diff) | |
| parent | a7ff6e90925a779e83e6498423b72f315232f768 (diff) | |
| download | mariadb-git-ae789bd65a6b8a3c5480ce0759e966e8479225f7.tar.gz | |
Merge mysql.com:/misc/mysql/31177/50-31177
into mysql.com:/misc/mysql/31177/51-31177
include/m_string.h:
Auto merged
include/my_getopt.h:
Auto merged
mysql-test/r/delayed.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-index_merge.result:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
manual merge
client/mysql.cc:
manual merge
client/mysqltest.c:
manual merge
mysql-test/r/subselect.result:
manual merge
mysys/my_getopt.c:
manual merge
sql/mysqld.cc:
manual merge
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 |