diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-04 15:12:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-04 15:12:14 +0200 |
| commit | ab2458c61fab2d8e6ead63577af434738874f1cf (patch) | |
| tree | fd8a5665f0835389ede2f077419e4c82f02c0c01 /extra | |
| parent | e214aa1cd35d282c27c1888bcd6cf943340c67ff (diff) | |
| parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
| download | mariadb-git-ab2458c61fab2d8e6ead63577af434738874f1cf.tar.gz | |
Merge 10.2 into 10.3
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 3fa4d88a10a..c79828b419c 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 05b9be0652f..72bd8badb53 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3087,7 +3087,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()); @@ -3119,9 +3128,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); } } |