diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 2 | ||||
| -rw-r--r-- | support-files/rpm/server.cnf | 9 | ||||
| -rw-r--r-- | support-files/wsrep.cnf.sh | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 1b6cc1cdb04..93222c1d3ac 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -30,7 +30,7 @@ %define mysqld_group mysql %define mysqldatadir /var/lib/mysql -%define release 1 +%define release 2 # # Macros we use which are not available in all supported versions of RPM diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf index 8cf2c74dbe4..2025a8b811a 100644 --- a/support-files/rpm/server.cnf +++ b/support-files/rpm/server.cnf @@ -1,14 +1,17 @@ # -# These groups are read by MariaDB server +# These groups are read by MariaDB server. # Use it for options that only the server (but not clients) should see # # See the examples of server my.cnf files in /usr/share/mysql/ # -[mysqld] - +# this is read by the standalone daemon and embedded servers [server] +# this is only for the mysqld standalone daemon +[mysqld] + +# this is only for embedded server [embedded] # This group is only read by MariaDB-5.5 servers. diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh index e8483910c0b..c04e5ddaf43 100644 --- a/support-files/wsrep.cnf.sh +++ b/support-files/wsrep.cnf.sh @@ -121,5 +121,8 @@ wsrep_sst_auth=root: # Desired SST donor name. #wsrep_sst_donor= +# Reject client queries when donating SST (false) +#wsrep_sst_donor_rejects_queries=0 + # Protocol version to use # wsrep_protocol_version= |