diff options
Diffstat (limited to 'extra/mariabackup/backup_copy.cc')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 1e2d57626e1..4573c1977e7 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -1395,7 +1395,9 @@ static lsn_t get_current_lsn(MYSQL *connection) "SHOW ENGINE INNODB STATUS", true, false)) { if (MYSQL_ROW row = mysql_fetch_row(res)) { - if (const char *p = strstr(row[2], lsn_prefix)) { + const char *p= strstr(row[2], lsn_prefix); + DBUG_ASSERT(p); + if (p) { p += sizeof lsn_prefix - 1; lsn = lsn_t(strtoll(p, NULL, 10)); } @@ -1483,7 +1485,7 @@ bool backup_start() write_binlog_info(mysql_connection); } - if (have_flush_engine_logs) { + if (have_flush_engine_logs && !opt_no_lock) { msg_ts("Executing FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS...\n"); xb_mysql_query(mysql_connection, "FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS", false); |