diff options
| author | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
| commit | 47890151b47af55431a808e59af738a35d1a0bb7 (patch) | |
| tree | 02e8baaa5fa67d84f1517dd0fe43ee84dd6ef34f /sql/repl_failsafe.cc | |
| parent | cd8f9ed2a294a80eb41f026eaab176e51209aa4c (diff) | |
| download | mariadb-git-47890151b47af55431a808e59af738a35d1a0bb7.tar.gz | |
Portability fixes
scripts/mysql_install_db.sh:
Portability fix (! is not portable)
sql/item_func.cc:
Use my_strtoll10() instead of strtoull()
sql/repl_failsafe.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_analyse.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_yacc.yy:
Use my_strtoll10() instead of strtoull()
strings/my_strtoll10.c:
Fix compiler warnings
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index f254ffb3df3..2a5381ae478 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -915,12 +915,14 @@ int load_master_data(THD* thd) setting active_mi, because init_master_info() sets active_mi with defaults. */ + int error; + if (init_master_info(active_mi, master_info_file, relay_log_info_file, 0)) send_error(thd, ER_MASTER_INFO); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); - active_mi->master_log_pos = strtoull(row[1], (char**) 0, 10); + active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error); /* at least in recent versions, the condition below should be false */ if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE) active_mi->master_log_pos = BIN_LOG_HEADER_SIZE; |