summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-06-07 14:11:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-06-07 14:11:55 +0300
commit619c277a6cc11b62e9d84449c0ee8ab39abc54f3 (patch)
tree5ec8aeb50422e7f53cc8923e67050246cda2b0c2
parentdf42830b286ab2d603d0ed1340925b8199c8d70e (diff)
downloadmariadb-git-619c277a6cc11b62e9d84449c0ee8ab39abc54f3.tar.gz
Mariabackup: Make some globals static
-rw-r--r--extra/mariabackup/backup_copy.cc1
-rw-r--r--extra/mariabackup/xtrabackup.cc4
-rw-r--r--extra/mariabackup/xtrabackup.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 2ea34406a6b..1405df9bcc8 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -1205,6 +1205,7 @@ cleanup:
+static
bool
backup_files(const char *from, bool prep_mode)
{
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 91c7b5faf0e..e14e65d1679 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -202,9 +202,9 @@ my_bool opt_ssl_verify_server_cert;
/* === metadata of backup === */
#define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
char metadata_type[30] = ""; /*[full-backuped|log-applied|incremental]*/
-lsn_t metadata_from_lsn;
+static lsn_t metadata_from_lsn;
lsn_t metadata_to_lsn;
-lsn_t metadata_last_lsn;
+static lsn_t metadata_last_lsn;
static ds_file_t* dst_log_file;
diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h
index c77485cb4de..2db5bc29b51 100644
--- a/extra/mariabackup/xtrabackup.h
+++ b/extra/mariabackup/xtrabackup.h
@@ -56,9 +56,7 @@ extern xb_page_bitmap *changed_page_bitmap;
extern char *xtrabackup_incremental;
extern my_bool xtrabackup_incremental_force_scan;
-extern lsn_t metadata_from_lsn;
extern lsn_t metadata_to_lsn;
-extern lsn_t metadata_last_lsn;
extern xb_stream_fmt_t xtrabackup_stream_fmt;
extern ibool xtrabackup_stream;