summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2012-06-29 13:25:57 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2012-06-29 13:25:57 +0200
commit1ede2dd8146254951493081f2297b0832fdd4d13 (patch)
tree2cb0c6d427fa7624b0acc5898cc6fd647152b6c2 /include
parent767501fb54f19adf3c136e5131daf11e34b3f039 (diff)
downloadmariadb-git-1ede2dd8146254951493081f2297b0832fdd4d13.tar.gz
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
This patch fixes various compilation warnings of the type "error: narrowing conversion of 'x' from 'datatype1' to 'datatype2'
Diffstat (limited to 'include')
-rw-r--r--include/my_getopt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 8112303a6a5..5824518a085 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
@@ -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 */