diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-16 22:19:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-16 22:19:16 +0200 |
| commit | d1253e19a1db9aa468035ab126efd50415fc0782 (patch) | |
| tree | 30deaadefe75e0448c920db2e716385abfb53529 | |
| parent | 836d4e74d9416a1af839f8068c5a07bee6f4b71e (diff) | |
| download | mariadb-git-d1253e19a1db9aa468035ab126efd50415fc0782.tar.gz | |
Fix compilation in mariabackup
Compilation got confused about 2 wsrep.h headers in include path
Rename backup's wsrep.h to backup_wsrep.h to fixO
| -rw-r--r-- | extra/mariabackup/backup_wsrep.h (renamed from extra/mariabackup/wsrep.h) | 4 | ||||
| -rw-r--r-- | extra/mariabackup/wsrep.cc | 1 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/extra/mariabackup/wsrep.h b/extra/mariabackup/backup_wsrep.h index 7638d1f2b54..5fa261f8db5 100644 --- a/extra/mariabackup/wsrep.h +++ b/extra/mariabackup/backup_wsrep.h @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *******************************************************/ -#ifndef WSREP_H -#define WSREP_H +#ifndef MARIABACKUP_WSREP_H +#define MARIABACKUP_WSREP_H /*********************************************************************** Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that diff --git a/extra/mariabackup/wsrep.cc b/extra/mariabackup/wsrep.cc index be11e058255..7b196725c07 100644 --- a/extra/mariabackup/wsrep.cc +++ b/extra/mariabackup/wsrep.cc @@ -46,6 +46,7 @@ permission notice: #include <trx0sys.h> #include "common.h" +#include "backup_wsrep.h" #ifdef WITH_WSREP #define WSREP_XID_PREFIX "WSREPXid" #define WSREP_XID_PREFIX_LEN MYSQL_XID_PREFIX_LEN diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index c42a282e203..f07b1c6d3e3 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -85,7 +85,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "xbstream.h" #include "changed_page_bitmap.h" #include "read_filt.h" -#include "wsrep.h" +#include "backup_wsrep.h" #include "innobackupex.h" #include "backup_mysql.h" #include "backup_copy.h" |