From: Bjorn Munch
Date: October 10 2012 9:17am
Subject: bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4385 to 4387)
List-Archive: http://lists.mysql.com/commits/145003
Message-Id: <20121010091714.19119.33480.4387@khepri15.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4387 Bjorn Munch	2012-10-10
      Added changelog

    modified:
      support-files/mysql.spec.sh
 4386 Bjorn Munch	2012-10-10
      Bug #14735448 NEW MY.CNF NOT CREATED WHEN --DEFAULTS-FILE IS USED WITH MYSQL_INSTALL_DB
        Followup fix: set wrong variable at one point if using --defaults-file
        Would have resulted in possibly wrong message being printed at the end

    modified:
      scripts/mysql_install_db.pl.in
 4385 Bjorn Munch	2012-10-09
      Bug #14735440 WRONG WARNING MESSAGES SHOWN WHEN MYSQL_INSTALL_DB IS RUN
        Changed wording slightly, just sdaying /etc/my.cnf (or whatever) will be used

    modified:
      scripts/mysql_install_db.pl.in
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-10-09 11:09:29 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-10-10 09:11:16 +0000
@@ -453,7 +453,7 @@ close TEMPL;
 my $print_def_file;
 if ( $opt->{'defaults-file'} )
 {
-  $config_file= $opt->{'defaults-file'};
+  $print_def_file= $opt->{'defaults-file'};
 }
 else
 {

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-10-03 22:53:04 +0000
+++ b/support-files/mysql.spec.sh	2012-10-10 09:13:31 +0000
@@ -1149,6 +1149,10 @@ echo "====="
 # merging BK trees)
 ##############################################################################
 %changelog
+* Thu Oct 04 2012 Bjorn Munch <bjorn.munch@stripped>
+
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
 * Mon Oct 01 2012 Joerg Bruehe <joerg.bruehe@stripped>
 
 - Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence

No bundle (reason: useless for push emails).