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

Do-compile fixes: 

 - fixed essential piece missing from last merge with 3.23 tree
   (InnoDB option)
 - Added "autoextend" parameter to InnoDB startup options to be able
   to pass the full sql-bench run without hitting an "table space full"
   error
parent 1d9225e0

Build-tools/Do-compile

+9 −2
Original line number Diff line number Diff line
@@ -215,7 +215,14 @@ if ($opt_stage <= 1) 


  # 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_innodb)

	{

		$opt_config_options.= " --with-innodb";

	}

	else

	{

		$opt_config_options.= " --without-innodb";

	}



  if ($opt_with_other_libc)

  {
@@ -314,7 +321,7 @@ if (!$opt_no_test) 
  }

  if ($opt_innodb)

  {

    $extra.=" --innodb_data_file_path=ibdata1:100M";

    $extra.=" --innodb_data_file_path=ibdata1:100M:autoextend";

  }

  safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking $extra >> $log 2>&1 &");

  sleep(2);