diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 13:15:37 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 13:15:37 +0300 |
| commit | ab150128ce78fd363f6041277862686a61730b2b (patch) | |
| tree | 1e1a04cc057f5d52eb223266623f32d805444a87 /storage/perfschema | |
| parent | 9534fd83ce6dc402132cc304c121c9205b430dda (diff) | |
| parent | 20e20f6db6fe7f752cccdb34c1ac1d54c2f30cec (diff) | |
| download | mariadb-git-ab150128ce78fd363f6041277862686a61730b2b.tar.gz | |
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3880.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index b77cae6d018..870702afb48 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -13,6 +13,10 @@ # along with this program; if not, write to the Free Software Foundation, # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA +IF (WITH_WSREP) + BUILD_WITH_WSREP() +ENDIF() + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql |