diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
| commit | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (patch) | |
| tree | 0716fe20a806adbe55581d9e996f29dcb3a5ab0b /extra | |
| parent | 7075d7fce626ee915c9ae9308cfb4a8120e83e44 (diff) | |
| parent | ab2458c61fab2d8e6ead63577af434738874f1cf (diff) | |
| download | mariadb-git-e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 2ff7e56f3ad..a9eef808008 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -153,7 +153,7 @@ xb_mysql_connect() return(NULL); } - xb_mysql_query(connection, "SET SESSION wait_timeout=2147483", + xb_mysql_query(connection, "SET SESSION wait_timeout=2147483, max_statement_time=0", false, true); return(connection); diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 3ad3de2b6c8..009a4891d93 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3090,7 +3090,16 @@ xb_load_single_table_tablespace( die("Can't open datafile %s", name); } - err = file->validate_first_page(&flush_lsn); + for (int i = 0; i < 10; i++) { + err = file->validate_first_page(&flush_lsn); + if (err != DB_CORRUPTION) { + break; + } + + my_sleep(1000); + } + + bool is_empty_file = file->exists() && file->is_empty_file(); if (err == DB_SUCCESS && file->space_id() != SRV_TMP_SPACE_ID) { os_offset_t node_size = os_file_get_size(file->handle()); @@ -3122,9 +3131,7 @@ xb_load_single_table_tablespace( delete file; - if (err != DB_SUCCESS && err != DB_CORRUPTION && xtrabackup_backup) { - /* allow corrupted first page for xtrabackup, it could be just - zero-filled page, which we restore from redo log later */ + if (err != DB_SUCCESS && xtrabackup_backup && !is_empty_file) { die("Failed to not validate first page of the file %s, error %d",name, (int)err); } } |