diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
| commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
| tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /support-files | |
| parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
| parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
| download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz | |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
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= |