bzr push into mysql-5.6 branch (joerg.bruehe:4268 to 4269)

[Joerg Bruehe]

 4269 Joerg Bruehe	2012-09-19
      'mysql_install_db': Align the Perl variant with the shell one.
     @ scripts/mysql_install_db.pl.in
        Omission: $resolveip was used but unset,
        and it lacked $extra_bindir as a path component.
        
        Difference to shell: "current_hostname" was never taken
        from "mysql_system_tables_data.sql", this filtering
        should only happen in a bootstrap run.

    modified:
      scripts/mysql_install_db.pl.in
 4268 Joerg Bruehe	2012-09-18
      Fix the Perl variant of "mysql_install_db".
     @ scripts/mysql_install_db.pl.in
        "--loose-skip-innodb" is not working in 5.6.8,
        and it isn't used in the Shell variant already.

    modified:
      scripts/mysql_install_db.pl.in
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-09-18 11:04:27 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-09-19 11:43:09 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -365,7 +365,7 @@ my $hostname = hostname();
 my $resolved;
 if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
 {
-  my $resolveip;
+  my $resolveip = "$extra_bindir/resolveip";
 
   $resolved = `$resolveip $hostname 2>&1`;
   if ( $? != 0 )
@@ -375,14 +375,14 @@ if ( !$opt->{'cross-bootstrap'} and !$op
     {
       error($opt,
             "Neither host '$hostname' nor 'localhost' could be looked up with",
-            "$bindir/resolveip",
+            "$resolveip",
             "Please configure the 'hostname' command to return a correct",
             "hostname.",
             "If you want to solve this at a later stage, restart this script",
             "with the --force option");
     }
     warning($opt,
-            "The host '$hostname' could not be looked up with resolveip.",
+            "The host '$hostname' could not be looked up with $resolveip.",
             "This probably means that your libc libraries are not 100 % compatible",
             "with this binary MySQL version. The MySQL daemon, mysqld, should work",
             "normally with the exception that host name resolving will not work.",
@@ -457,12 +457,10 @@ if ( open(PIPE, "| $mysqld_install_cmd_l
   }
   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/;
+    next if $opt->{'cross-bootstrap'} and /\@current_hostname/;
 
     print PIPE $_;
   }

No bundle (reason: useless for push emails).