From: Georgi Kodinov
Date: September 11 2012 9:07am
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:4453 to 4454)
List-Archive: http://lists.mysql.com/commits/144729
Message-Id: <20120911090711.1203.86850.4454@dhcp-uk-twvpn-1-vpnpool-10-175-16-164.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4454 Georgi Kodinov	2012-09-11 [merge]
      merge

    modified:
      scripts/mysql_install_db.pl.in
 4453 Amit Bhattacharya	2012-09-11 [merge]
      Merge from mysql-5.6 to trunk

    added:
      mysql-test/r/multi_table_upd_del_sj.result
      mysql-test/t/multi_table_upd_del_sj.test
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-03-06 14:29:42 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-09-11 09:05:18 +0000
@@ -423,9 +423,11 @@ my $mysqld_install_cmd_line = quote_opti
                                             "--bootstrap",
                                             "--basedir=$opt->{basedir}",
                                             "--datadir=$opt->{ldata}",
-                                            "--skip-bdb",
-                                            "--skip-ndbcluster",
+                                            "--log-warnings=0",
+                                            "--loose-skip-innodb",
+                                            "--loose-skip-ndbcluster",
                                             "--max_allowed_packet=8M",
+                                            "--default-storage-engine=MyISAM",
                                             "--net_buffer_length=16K",
                                             @args,
                                           );
@@ -438,6 +440,8 @@ report_verbose_wait($opt,"Installing MyS
 
 open(SQL, $create_system_tables)
   or error($opt,"can't open $create_system_tables for reading: $!");
+open(SQL2, $fill_system_tables)
+  or error($opt,"can't open $fill_system_tables for reading: $!");
 # FIXME  > /dev/null ?
 if ( open(PIPE, "| $mysqld_install_cmd_line") )
 {
@@ -451,8 +455,20 @@ if ( open(PIPE, "| $mysqld_install_cmd_l
 
     print PIPE $_;
   }
+  while ( <SQL2> )
+  {
+    # TODO: make it similar to the above condition when we're sure 
+    #   @@hostname returns a fqdn
+    # When doing a "cross bootstrap" install, no reference to the current
+    # host should be added to the system tables.  So we filter out any
+    # lines which contain the current host name.
+    next if /\@current_hostname/;
+
+    print PIPE $_;
+  }
   close PIPE;
   close SQL;
+  close SQL2;
 
   report_verbose($opt,"OK");
 

No bundle (reason: useless for push emails).