Merge pull request #1152 from codership/10.4-wsrep-lib-update

Updated wsrep-lib to galera cache encryption implementation

Merge pull request #1152 from codership/10.4-wsrep-lib-update
Updated wsrep-lib to galera cache encryption implementation
c949d61e · Jan Lindström · GitHub · e80bcd7f · 239b2dcf · c949d61e
Commit c949d61e authored Feb 07, 2019 by Jan Lindström Committed by GitHub Feb 07, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/wsrep_server_state.cc sql/wsrep_server_state.cc +1 -0

wsrep-lib wsrep-lib +1 -1

No files found.
--- a/sql/wsrep_server_state.cc
+++ b/sql/wsrep_server_state.cc
@@ -34,6 +34,7 @@ Wsrep_server_state::Wsrep_server_state(const std::string& name,
  : wsrep::server_state(m_mutex,
                        m_cond,
                        m_service,
+                        NULL,
                        name,
                        incoming_address,
                        address,

--- a/wsrep-lib @ e7d72ae7
+++ b/wsrep-lib @ e7d72ae7
-Subproject commit 136767ae044eac53e7f3d76909d176cde0dc27a8
+Subproject commit e7d72ae7f6a6995a21d743389426a963429a1fff