summaryrefslogtreecommitdiff
path: root/client
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 /client
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 'client')
-rw-r--r--client/mysqlbinlog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index dd09e7a0938..e7840865a58 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 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
@@ -1149,7 +1149,7 @@ static struct my_option my_long_options[] =
"Stop reading the binlog at position N. Applies to the last binlog "
"passed on the command line.",
&stop_position, &stop_position, 0, GET_ULL,
- REQUIRED_ARG, (ulonglong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE,
+ REQUIRED_ARG, (longlong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE,
(ulonglong)(~(my_off_t)0), 0, 0, 0},
{"to-last-log", 't', "Requires -R. Will not stop at the end of the \
requested binlog but rather continue printing until the end of the last \