summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-07-21 17:27:06 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-07-21 17:27:06 -0400
commite5cea60933328af408c3d2636eeed0597e6f0e2e (patch)
tree11c100a43a62c44de266bef7a19b43a8f748ba84 /include
parenteaa0fe7cf859ad822f71bbaa2a47b23b4963ba9d (diff)
downloadmariadb-git-e5cea60933328af408c3d2636eeed0597e6f0e2e.tar.gz
Local merge of patch for MDEV-3896 from maria-5.5-galera.
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_default_groups.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/mysqld_default_groups.h b/include/mysqld_default_groups.h
index a2e94ddd854..30dfdae1338 100644
--- a/include/mysqld_default_groups.h
+++ b/include/mysqld_default_groups.h
@@ -5,4 +5,7 @@ const char *load_default_groups[]= {
"mysqld", "server", MYSQL_BASE_VERSION,
"mariadb", MARIADB_BASE_VERSION,
"client-server",
+#ifdef WITH_WSREP
+"galera",
+#endif
0, 0};