summaryrefslogtreecommitdiff
path: root/support-files/rpm
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-14 15:43:12 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-14 15:43:12 +0300
commit26f0cd8afcbdceff22223d4c521c3ce73ee09fda (patch)
tree8b411062f27139213783bc4ae85c64e3111f7530 /support-files/rpm
parent0b7a79c6b0d460c522f42f12cc73a1c79ae4e9a8 (diff)
parentc1394ab6b5c0830ec09f6afdae11fa82bae1a123 (diff)
downloadmariadb-git-26f0cd8afcbdceff22223d4c521c3ce73ee09fda.tar.gz
Merge 5.5 into 10.1
Diffstat (limited to 'support-files/rpm')
-rw-r--r--support-files/rpm/my.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/rpm/my.cnf b/support-files/rpm/my.cnf
index 913b88f8328..8c6a7139de5 100644
--- a/support-files/rpm/my.cnf
+++ b/support-files/rpm/my.cnf
@@ -5,7 +5,7 @@
[client-server]
#
-# include all files from the config directory
+# include *.cnf from the config directory
#
!includedir /etc/my.cnf.d