diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
| commit | 050048462c8209a5e5d75587147d343f683cc7df (patch) | |
| tree | e59402376e17ec2bcafbd8ff085307b066cdf7c4 /include | |
| parent | 47c1ce35e2ce9b9e756be17ab3a1ce309eea12c8 (diff) | |
| parent | 435866976746d342847ad2a7a13be77cd77c556b (diff) | |
| download | mariadb-git-050048462c8209a5e5d75587147d343f683cc7df.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
Manual merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'include')
| -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 092accc05a1..04278c061a5 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. 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 @@ -79,7 +79,7 @@ struct my_option enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG */ longlong def_value; /**< Default value */ longlong min_value; /**< Min allowed value (for numbers) */ - longlong max_value; /**< Max allowed value (for numbers) */ + ulonglong max_value; /**< Max allowed value (for numbers) */ longlong sub_size; /**< Unused */ long block_size; /**< Value should be a mult. of this (for numbers) */ void *app_type; /**< To be used by an application */ |