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 | 54ad7d88d03c940330510e0870e4bce17327a952 (patch) | |
| tree | 84d18e52bd97b323fa4ba6bb3915a25c2239ab6f /include/my_getopt.h | |
| parent | f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff) | |
| parent | 89a208850a714d5653207cffa2d654e86063a7e7 (diff) | |
| download | mariadb-git-54ad7d88d03c940330510e0870e4bce17327a952.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/my_getopt.h')
| -rw-r--r-- | include/my_getopt.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |