bzr commit into MySQL/Maria:mysql-maria branch (monty:2712)

[Michael Widenius]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2712 Michael Widenius	2008-12-22 [merge]
      Automatic merge with MySQL-5.1-Maria tree
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-12-10 21:42:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-12-15 12:34:57 +0000
@@ -3186,6 +3186,7 @@ sub install_db ($$) {
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-innodb");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
+  mtr_add_arg($args, "--loose-skip-maria");
   mtr_add_arg($args, "--disable-sync-frm");
   mtr_add_arg($args, "--loose-disable-debug");
   mtr_add_arg($args, "--tmpdir=.");