Do-compile monty's uncommitted stuff

Build-tools/Do-compile

@@ -27,11 +27,11 @@ if (defined($gcc_version) && ! $opt_config_env)
   $tmp=`$gcc_version -v 2>&1`;
   if ($tmp =~ /version 2\.7\./)
   {
-    $opt_config_env= 'CC=gcc CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer"';
+    $opt_config_env= 'CC=gcc CFLAGS="-O2 " CXX=gcc CXXFLAGS="-O2 "';
   }
   else
   {
-    $opt_config_env= 'CC=gcc CFLAGS="-O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"';
+    $opt_config_env= 'CC=gcc CFLAGS="-O3 " CXX=gcc CXXFLAGS="-O3  -felide-constructors -fno-exceptions -fno-rtti"';
   }
 }
 
@@ -68,6 +68,9 @@ if ($opt_stage == 0)
   if (-x "$host/bin/mysqladmin")
   {
     log_system("$host/bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown");
+    log_system("$host/bin/mysqladmin --no-defaults -u root -P $mysql_tcp_port -h $host -s shutdown");
+    log_system("$host/bin/mysqladmin --no-defaults -u root -P 9306 -h $host -s shutdown");
+    log_system("$host/bin/mysqladmin --no-defaults -u root -P 9307 -h $host -s shutdown");
   }
   system("mkdir $host") if (! -d $host);
   system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);