From: Joerg Bruehe
Date: December 10 2012 12:16pm
Subject: bzr push into mysql-5.6 branch (joerg.bruehe:4569 to 4570) WL#6055
List-Archive: http://lists.mysql.com/commits/145465
Message-Id: <20121210121623.4024.56725.4570@trift-6core.fambruehe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4570 Joerg Bruehe	2012-12-10
      Apply WL#6055 to the spec file for ULN RPMs.

    modified:
      packaging/rpm-uln/mysql.spec.sh
 4569 Joerg Bruehe	2012-12-10
      Upmerge 5.5 -> 5.6:
      Fix the ULN RPM spec file, creation of a "libmysqld.so"
      did not yet work in 5.6.

    modified:
      packaging/rpm-uln/mysql.spec.sh
=== modified file 'packaging/rpm-uln/mysql.spec.sh'
--- a/packaging/rpm-uln/mysql.spec.sh	2012-12-10 08:56:16 +0000
+++ b/packaging/rpm-uln/mysql.spec.sh	2012-12-10 12:15:39 +0000
@@ -935,8 +935,7 @@ fi
 %{_datadir}/mysql/mysql_system_tables.sql
 %{_datadir}/mysql/mysql_system_tables_data.sql
 %{_datadir}/mysql/mysql_test_data_timezone.sql
-%{_datadir}/mysql/my-*.cnf
-%{_datadir}/mysql/config.*.ini
+%{_datadir}/mysql/my-default.cnf
 
 /etc/rc.d/init.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
@@ -973,6 +972,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Dec 10 2012 Joerg Bruehe <joerg.bruehe@stripped>
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
 * Thu Dec  7 2012 Joerg Bruehe <joerg.bruehe@stripped>
 - Change the way in which "libmysqld.so" is created: Using all object modules
   was wrong, gcc / ld can resolve the dependencies from "libmysqld.a".

No bundle (reason: useless for push emails).