bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4375 to 4378)

[Bjorn Munch]

 4378 Bjorn Munch	2012-10-04
      Added support for lines to remove from my-default.cnf

    modified:
      scripts/mysql_install_db.pl.in
      support-files/my-default.cnf.sh
 4377 Bjorn Munch	2012-10-04
      Minimal default.push; we just need to test build & pkgver

    modified:
      mysql-test/collections/default.push
 4376 Bjorn Munch	2012-10-04
      Silly programming error: redeclared global variable as local in an else block

    modified:
      scripts/mysql_install_db.pl.in
 4375 Bjorn Munch	2012-10-04
      Another shot in the dark to fix RPM build

    modified:
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2012-08-27 11:05:24 +0000
+++ b/mysql-test/collections/default.push	2012-10-04 08:35:39 +0000
@@ -1,5 +1 @@
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl 
+perl mysql-test-run.pl --comment=mini --vardir=var-mini mysqltest

=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-10-03 19:59:16 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-10-04 13:34:32 +0000
@@ -447,13 +447,21 @@ else
 				  "share","share/mysql","support-files");
   -e $cfg_template or cannot_find_file("my-default.cnf");
 
-  my $copy_cfg_file= $config_file;
+  $copy_cfg_file= $config_file;
   if (-e $config_file)
-    {
-      $copy_cfg_file =~ s/my.cnf/my-new.cnf/;
-      # Too early to print warning here, the user may not notice
-    }
-  copy($cfg_template, $copy_cfg_file) or error("Could not copy config file");
+  {
+    $copy_cfg_file =~ s/my.cnf/my-new.cnf/;
+    # Too early to print warning here, the user may not notice
+  }
+  open (TEMPL, $cfg_template) or error("Could not open config template");
+  open (CFG, ">" . $copy_cfg_file) or error("Could not open config file");
+  while (<TEMPL>)
+  {
+    # Remove lines beginning with # *** which are template comments
+    print CFG $_ unless /^# \*\*\*/;
+  }
+  close CFG;
+  close TEMPL;
 }
 
 # ----------------------------------------------------------------------

=== modified file 'support-files/my-default.cnf.sh'
--- a/support-files/my-default.cnf.sh	2012-10-03 16:41:09 +0000
+++ b/support-files/my-default.cnf.sh	2012-10-04 13:34:32 +0000
@@ -1,5 +1,8 @@
 # For advice on how to change settings please see
 # http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html
+# *** DO NOT EDIT THIS FILE. It's a template which will be copied to the
+# *** default location during install, and will be replaced if you
+# *** upgrade to a newer version of MySQL.
 
 [mysqld]
 

No bundle (reason: useless for push emails).