List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:October 3 2012 8:01pm
Subject:bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4373 to 4374)
View as plain text  
 4374 Bjorn Munch	2012-10-03
      Shots in the dark to fix RPM and PKG builds

    modified:
      scripts/mysql_install_db.pl.in
      support-files/mysql.spec.sh
 4373 Bjorn Munch	2012-10-03
      WL #6055 New default config file
        Forgot to bzr add two files
        Please ignore scripts/mysql_security_commands.sql, it is of no
        relevance to this WL

    added:
      scripts/mysql_security_commands.sql
      support-files/my-default.cnf.sh
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-10-03 15:00:39 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-10-03 19:59:16 +0000
@@ -919,3 +919,10 @@ sub warning
   map {print "$_\n"} @_;
   print "\n";
 }
+
+# Include dummy lines with patterns that generalized pkgadd script expects
+
+my $_pkgadd_fodder= "
+basedir=foo
+datadir=bar
+";

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-10-03 09:02:59 +0000
+++ b/support-files/mysql.spec.sh	2012-10-03 19:59:16 +0000
@@ -988,7 +988,7 @@ echo "====="
 %doc %{src_dir}/Docs/ChangeLog
 %doc %{src_dir}/Docs/INFO_SRC*
 %doc release/Docs/INFO_BIN*
-%doc release/support-files/my-*.cnf
+%doc release/share/my-*.cnf
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4373 to 4374) Bjorn Munch4 Oct