Commit 66646cc4 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

- merge 4.0 modifications to Build-tools/Do-compile

parent 649413f7
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -208,12 +208,15 @@ if ($opt_stage <= 1)
  $opt_config_options.= " --disable-shared" if (!$opt_enable_shared); # Default for binary versions
  $opt_config_options.= " --with-berkeley-db" if ($opt_bdb);
  $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);
  $opt_config_options.= " --with-innodb" if ($opt_innodb);
  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);
  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);
  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);
  $opt_config_options.= " --with-raid" if ($opt_raid);

  # Only enable InnoDB when requested (required to be able to
  # build the "Classic" packages that do not include InnoDB)
  $opt_config_options.= " --without-innodb" if (!$opt_innodb);

  if ($opt_with_other_libc)
  {
    $opt_with_other_libc= " --with-other-libc=$opt_with_other_libc";
@@ -516,9 +519,9 @@ sub abort
    open(TMP,">$mail_header_file");
    print TMP "From: mysql\@$full_host_name\n";
    print TMP "To: $email\n";
    print TMP "Subject: MySQL compilation failed again\n\n";
    print TMP "Subject: $ver$opt_version_suffix compilation failed\n\n";
    close TMP;
    system("tail -30 $log > $log.mail");
    system("tail -40 $log > $log.mail");
    system("cat $mail_header_file $log.mail | $sendmail -t -f $email");
    unlink($mail_header_file);
    unlink("$log.mail");