From 38357b30e6ccf4278807cbd8b91ca14efe3fff15 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Thu, 22 Nov 2001 17:55:18 +0200
Subject: Fixed fulltext after merge from 3.23.45 First (incomplete) version of
 transaction and as3ap tests.

BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C
---
 sql-bench/run-all-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql-bench/run-all-tests.sh')

diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index c2f687a9375..eb07d85be03 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -195,6 +195,10 @@ while (<test-*>)
       print "Summary for $prog: ", join(" ",@prog_sum), "\n";
     }
   }
+  elsif ($last_line =~ /^Test skipped/i)
+  {
+    print "$last_line\n";
+  }
   else
   {
     $errors++;
-- 
cgit v1.2.1