Commit d1253e19 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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
parent 836d4e74
...@@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software ...@@ -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 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/ *******************************************************/
#ifndef WSREP_H #ifndef MARIABACKUP_WSREP_H
#define WSREP_H #define MARIABACKUP_WSREP_H
/*********************************************************************** /***********************************************************************
Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that
......
...@@ -46,6 +46,7 @@ permission notice: ...@@ -46,6 +46,7 @@ permission notice:
#include <trx0sys.h> #include <trx0sys.h>
#include "common.h" #include "common.h"
#include "backup_wsrep.h"
#ifdef WITH_WSREP #ifdef WITH_WSREP
#define WSREP_XID_PREFIX "WSREPXid" #define WSREP_XID_PREFIX "WSREPXid"
#define WSREP_XID_PREFIX_LEN MYSQL_XID_PREFIX_LEN #define WSREP_XID_PREFIX_LEN MYSQL_XID_PREFIX_LEN
......
...@@ -85,7 +85,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -85,7 +85,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "xbstream.h" #include "xbstream.h"
#include "changed_page_bitmap.h" #include "changed_page_bitmap.h"
#include "read_filt.h" #include "read_filt.h"
#include "wsrep.h" #include "backup_wsrep.h"
#include "innobackupex.h" #include "innobackupex.h"
#include "backup_mysql.h" #include "backup_mysql.h"
#include "backup_copy.h" #include "backup_copy.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment