diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-25 17:17:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-25 17:17:21 +0300 |
| commit | cbd0da66e48a2ea31917dae0b49a4ca6092959e7 (patch) | |
| tree | 9efc2c0f3e1c0cd367255fce203c15190d13888f /extra/mariabackup/fil_cur.cc | |
| parent | a02551b0ba220cb138cf3e9cddd82539620c6432 (diff) | |
| parent | 909cdafd35c05b56e47d2c791149a5dd85621870 (diff) | |
| download | mariadb-git-cbd0da66e48a2ea31917dae0b49a4ca6092959e7.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'extra/mariabackup/fil_cur.cc')
| -rw-r--r-- | extra/mariabackup/fil_cur.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index 03f4ce0d7a7..e0f0df72611 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -1,5 +1,5 @@ /****************************************************** -XtraBackup: hot backup tool for InnoDB +MariaBackup: hot backup tool for InnoDB (c) 2009-2013 Percona LLC and/or its affiliates. Originally Created 3/3/2009 Yasufumi Kinoshita Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, @@ -169,7 +169,7 @@ xb_fil_cur_open( /* The following call prints an error message */ os_file_get_last_error(TRUE); - msg("[%02u] xtrabackup: error: cannot open " + msg("[%02u] mariabackup: error: cannot open " "tablespace %s\n", thread_n, cursor->abs_path); @@ -196,7 +196,7 @@ xb_fil_cur_open( cursor->file = node->handle; if (stat(cursor->abs_path, &cursor->statinfo)) { - msg("[%02u] xtrabackup: error: cannot stat %s\n", + msg("[%02u] mariabackup: error: cannot stat %s\n", thread_n, cursor->abs_path); xb_fil_cur_close(cursor); @@ -222,7 +222,7 @@ xb_fil_cur_open( if (!fsp_flags_is_valid(flags, cursor->space_id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { - msg("[%02u] xtrabackup: Error: Invalid " + msg("[%02u] mariabackup: Error: Invalid " "tablespace flags: %x.\n", thread_n, uint(flags)); return(XB_FIL_CUR_SKIP); } @@ -294,9 +294,9 @@ xb_fil_cur_read( && offset + to_read == cursor->statinfo.st_size) { if (to_read < (ib_int64_t) page_size) { - msg("[%02u] xtrabackup: Warning: junk at the end of " + msg("[%02u] mariabackup: Warning: junk at the end of " "%s:\n", cursor->thread_n, cursor->abs_path); - msg("[%02u] xtrabackup: Warning: offset = %llu, " + msg("[%02u] mariabackup: Warning: offset = %llu, " "to_read = %llu\n", cursor->thread_n, (unsigned long long) offset, @@ -354,7 +354,7 @@ read_retry: space)) { retry_count--; if (retry_count == 0) { - msg("[%02u] xtrabackup: " + msg("[%02u] mariabackup: " "Error: failed to read page after " "10 retries. File %s seems to be " "corrupted.\n", cursor->thread_n, @@ -364,7 +364,7 @@ read_retry: } if (retry_count == 9) { - msg("[%02u] xtrabackup: " + msg("[%02u] mariabackup: " "Database page corruption detected at page " ULINTPF ", retrying...\n", cursor->thread_n, page_no); |