[Commits] Rev 3863: Local merge of patch for MDEV-3896 from maria-5.5-galera. in lp:~maria-captains/maria/maria-10.0-galera

Nirbhay Choubey nirbhay at skysql.com
Tue Jul 22 00:27:10 EEST 2014


At lp:~maria-captains/maria/maria-10.0-galera

------------------------------------------------------------
revno: 3863
revision-id: nirbhay at skysql.com-20140721212706-jz1hnbm5wzfm5jpi
parent: nirbhay at skysql.com-20140715050149-46sygs7af6xab7xb
committer: Nirbhay Choubey <nirbhay at skysql.com>
branch nick: maria-10.0-galera_3896
timestamp: Mon 2014-07-21 17:27:06 -0400
message:
  Local merge of patch for MDEV-3896 from maria-5.5-galera.
-------------- next part --------------
=== modified file 'debian/additions/my.cnf'
--- a/debian/additions/my.cnf	2012-07-05 07:29:34 +0000
+++ b/debian/additions/my.cnf	2014-07-21 21:27:06 +0000
@@ -151,7 +151,21 @@
 # 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

=== modified file 'include/mysqld_default_groups.h'
--- a/include/mysqld_default_groups.h	2013-03-06 08:32:13 +0000
+++ b/include/mysqld_default_groups.h	2014-07-21 21:27:06 +0000
@@ -5,4 +5,7 @@
 "mysqld", "server", MYSQL_BASE_VERSION,
 "mariadb", MARIADB_BASE_VERSION,
 "client-server",
+#ifdef WITH_WSREP
+"galera",
+#endif
 0, 0};

=== modified file 'support-files/rpm/server.cnf'
--- a/support-files/rpm/server.cnf	2013-09-25 17:41:28 +0000
+++ b/support-files/rpm/server.cnf	2014-07-21 21:27:06 +0000
@@ -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]
 



More information about the commits mailing list