Merge heikki@work.mysql.com:/home/bk/mysql

into hundin.mysql.fi:/home/heikki/mysql

Build-tools/Do-compile

@@ -374,14 +374,14 @@ if ($opt_stage <= 9 && !$opt_no_test)
   log_system("rm -f output/*");
   $tmp= $opt_fast_benchmark ? "--fast --user root --small-test" : "";
   check_system("perl ./run-all-tests --log --die-on-errors $connect_option $tmp","RUN-mysql");
-  if ($opt_bdb)
-  {
-    check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql");
-  }
   if ($opt_innodb)
   {
     check_system("perl ./run-all-tests --log --suffix=\"_innodb\" --die-on-errors $connect_option $tmp --create-option=\"type=innodb\"","RUN-mysql");
   }
+  if ($opt_bdb)
+  {
+    check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql");
+  }
 }
 
 rm_all($bench_tmpdir);