Local merge of patch for MDEV-3896 from maria-5.5-galera.

MariaDB · Jul 21, 2014 · e5cea60 · e5cea60
1 parent eaa0fe7
commit e5cea60
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
@@ -151,7 +151,21 @@ innodb_flush_method	= O_DIRECT
 # ssl-cert=/etc/mysql/server-cert.pem
 # ssl-key=/etc/mysql/server-key.pem
 
-
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_provider=
+#wsrep_cluster_address=
+#wsrep_slave_threads=1
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#query_cache_size=0
+#
+# Optional setting
+#innodb_flush_log_at_trx_commit=2
 
 [mysqldump]
 quick

diff --git 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};
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
@@ -11,6 +11,22 @@
 # this is only for the mysqld standalone daemon
 [mysqld]
 
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_provider=
+#wsrep_cluster_address=
+#wsrep_slave_threads=1
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#query_cache_size=0
+#
+# Optional setting
+#innodb_flush_log_at_trx_commit=2
+
 # this is only for embedded server
 [embedded]