Change my.cnf

Change-Id: I1378c8386b02441b9c50f2cdcfa83653141409eb

diff --git a/mos.my.cnf b/mos.my.cnf
new file mode 100644 (file)
index 0000000..4287006
--- /dev/null
+++ b/mos.my.cnf
@@ -0,0 +1,40 @@
+[client]
+port                = 3306
+socket              = /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+socket              = /var/run/mysqld/mysqld.sock
+nice                = 0
+
+[mysqld]
+user                = mysql
+pid-file            = /var/run/mysqld/mysqld.pid
+socket              = /var/run/mysqld/mysqld.sock
+port                = 3306
+basedir             = /usr
+datadir             = /var/lib/mysql
+tmpdir              = /tmp
+lc-messages-dir     = /usr/share/mysql
+bind-address        = 127.0.0.1
+key_buffer          = 16M
+max_allowed_packet  = 16M
+thread_stack        = 192K
+thread_cache_size   = 8
+myisam-recover      = BACKUP
+query_cache_limit   = 1M
+query_cache_size    = 16M
+log_error           = /var/log/mysql/error.log
+expire_logs_days    = 10
+max_binlog_size     = 100M
+skip-external-locking
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet  = 16M
+
+[mysql]
+[isamchk]
+key_buffer          = 16M
+
+!includedir /etc/my.cnf.d/

diff --git a/mysql.spec b/mysql.spec
index 8b1e92f06f0928d0b9f0cda9d69869f123256a74..c5b6f4ae98d7cacbb53df1781610d378c2c8ee42 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -200,10 +200,11 @@ Name:           MySQL%{product_suffix}
 Summary:        MySQL: a very fast and reliable SQL database server
 Group:          Applications/Databases
 Version:        5.6.23_wsrep_25.10
-Release:        %{release}%{?dist}~mos8.0.3
+Release:        %{release}%{?dist}~mos8.0.4
 # Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2015, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
-Source:         mysql-5.6.23.tar.gz
+Source0:        mysql-5.6.23.tar.gz
+Source1:        mos.my.cnf
 URL:            http://www.mysql.com/
 Packager:       Codership Oy <info@galeracluster.com>
 Vendor:         %{mysql_vendor}
@@ -559,6 +560,8 @@ install -d $RBR%{_sbindir}
 install -d $RBR%{_var}/log/mysql
 install -d $RBR%{_var}/run/mysqld
 
+install -m644 %{SOURCE1} $RBR%{_sysconfdir}/my.cnf
+
 mkdir -p $RBR%{_sysconfdir}/my.cnf.d
 
 # Install all binaries
@@ -588,7 +591,6 @@ ln -sf wsrep_sst_rsync $RBR%{_bindir}/wsrep_sst_rsync_wan
 # Just to make sure it's in the file list and marked as a config file
 #touch $RBR%{_sysconfdir}/my.cnf
 touch $RBR%{_sysconfdir}/wsrep.cnf
-install -m 660 $MBD/packaging/rpm-uln/my.cnf $RBR%{_sysconfdir}/my.cnf
 
 # Install SELinux files in datadir
 install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
@@ -1249,6 +1251,9 @@ echo "====="                                     >> $STATUS_HISTORY
 # merging BK trees)
 ##############################################################################
 %changelog
+* Fri Oct  2 2015 Ivan Suzdal <isuzdal@mirantis.com> - 5.6.23-25.10%{?dist}~mos8.0.4
+- Add my.cnf
+
 * Tue Sep 29 2015 Ivan Suzdal <isuzdal@mirantis.com> - 5.6.23-25.10%{?dist}~mos8.0.2
 - Add Obsoletes and Provide for packages