diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
| commit | f72a7659976089dc6f727bb31e8a91306199cf57 (patch) | |
| tree | 0199cd1bf1c16b01b358ab88e5dce5b038349872 /include/my_getopt.h | |
| parent | ed06ba3492d55c9e9dde231b55352f854e5e4b50 (diff) | |
| parent | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (diff) | |
| download | mariadb-git-f72a7659976089dc6f727bb31e8a91306199cf57.tar.gz | |
5.2 merge.
two tests still fail:
main.innodb_icp and main.range_vs_index_merge_innodb
call records_in_range() with both range ends being open
(which triggers an assert)
Diffstat (limited to 'include/my_getopt.h')
| -rw-r--r-- | include/my_getopt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index aeed8fa1586..a8d14c9aba5 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2011, Oracle and/or its affiliates. + Copyright (c) 2002, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ struct my_option enum get_opt_arg_type arg_type; longlong def_value; /* Default value */ longlong min_value; /* Min allowed value */ - longlong max_value; /* Max allowed value */ + ulonglong max_value; /* Max allowed value */ longlong sub_size; /* Subtract this from given value */ long block_size; /* Value should be a mult. of this */ void *app_type; /* To be used by an application */ |