summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqlbinlog.cc8
-rw-r--r--sql/slave.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc
index 087d1029afb..c2978db4883 100644
--- a/sql/mysqlbinlog.cc
+++ b/sql/mysqlbinlog.cc
@@ -62,12 +62,12 @@ static struct option long_options[] =
void sql_print_error(const char *format,...);
static bool short_form = 0;
-static int offset = 0;
+static longlong offset = 0;
static const char* host = "localhost";
static int port = MYSQL_PORT;
static const char* user = "test";
static const char* pass = "";
-static long position = 0;
+static longlong position = 0;
static bool use_remote = 0;
static short binlog_flags = 0;
static MYSQL* mysql = NULL;
@@ -166,11 +166,11 @@ static int parse_args(int *argc, char*** argv)
break;
case 'o':
- offset = atoi(optarg);
+ offset = atoll(optarg);
break;
case 'j':
- position = atoi(optarg);
+ position = atoll(optarg);
break;
case 'h':
diff --git a/sql/slave.cc b/sql/slave.cc
index 7ba6d69a204..ffede2c3201 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -526,7 +526,7 @@ int init_master_info(MASTER_INFO* mi)
return 1;
}
- mi->pos = atoi(buf);
+ mi->pos = atoll(buf);
mi->fd = fd;
if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file,
master_host) ||