diff options
| author | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
| commit | be46289855f01c0d563671beb5135c22b7bad2aa (patch) | |
| tree | dc6d00358536a5dca27f806f929ab5e25a000c92 /sql/repl_failsafe.cc | |
| parent | e2a5c3e4cd331d9addc2342549e2c47ac7e9cb7a (diff) | |
| download | mariadb-git-be46289855f01c0d563671beb5135c22b7bad2aa.tar.gz | |
New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index eabba9c68fc..6cc7ef7404b 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -201,7 +201,7 @@ void end_slave_list() static int find_target_pos(LEX_MASTER_INFO* mi, IO_CACHE* log, char* errmsg) { - uint32 log_pos = mi->pos; + uint32 log_pos = (uint32) mi->pos; uint32 target_server_id = mi->server_id; for (;;) @@ -799,8 +799,7 @@ int load_master_data(THD* thd) { strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); - // atoi() is ok, since offset is <= 1GB - active_mi->master_log_pos = atoi(row[1]); + active_mi->master_log_pos = strtoull(row[1], (char**) 0, 10); if (active_mi->master_log_pos < 4) active_mi->master_log_pos = 4; // don't hit the magic number active_mi->rli.pending = 0; |