1 files changed, 7 insertions, 12 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test b/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test
index 0a1d7de3747..9dcb044d4d4 100644
--- a/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test
@@ -9,7 +9,6 @@ disable_warnings;
 drop table if exists t;
 enable_warnings;
 
-let $maxq = 20;
 let $debug = 0;
 
 # create the range partition table
@@ -51,6 +50,8 @@ INSERT INTO t SELECT null,val FROM t;
 INSERT INTO t SELECT null,val FROM t;
 SELECT count(*) FROM t;
 
+let $maxq = 30;
+
 set tokudb_bulk_fetch=ON;
 let $s = `select unix_timestamp()`;
 let $i = 0;
@@ -60,8 +61,6 @@ while ($i < $maxq) {
 }
 let $time_bf_on = `select unix_timestamp() - $s`;
 
-if ($debug) { echo index scans took $time_bf_on; }
-
 set tokudb_bulk_fetch=OFF;
 let $s = `select unix_timestamp()`;
 let $i = 0;
@@ -71,11 +70,10 @@ while ($i < $maxq) {
 }
 let $time_bf_off = `select unix_timestamp() - $s`;
 
-if ($debug) { echo index scans took $time_bf_off.; }
-
 # check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_off > $time_bf_on && $time_bf_off >= 1.5 * $time_bf_on`;
+let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
 echo $verdict;
+if ($debug) { echo index $verdict $time_bf_on $time_bf_off; }
 if (!$verdict) { echo index scan $time_bf_on $time_bf_off; }
 
 set tokudb_bulk_fetch=ON;
@@ -87,8 +85,6 @@ while ($i < $maxq) {
 }
 let $time_bf_on = `select unix_timestamp() - $s`;
 
-if ($debug) { echo range scans took $time_bf_on; }
-
 set tokudb_bulk_fetch=OFF;
 let $s = `select unix_timestamp()`;
 let $i = 0;
@@ -98,11 +94,10 @@ while ($i < $maxq) {
 }
 let $time_bf_off = `select unix_timestamp() - $s`;
 
-if ($debug) { echo range scans took $time_bf_off.; }
-
 # check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_off > $time_bf_on && $time_bf_off >= 1.5 * $time_bf_on`;
+let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
 echo $verdict;
-if (!$verdict) { echo range scan $time_bf_on $time_bf_off; }
+if ($debug) { echo range $verdict $time_bf_on $time_bf_off; }
+if (!$verdict) { echo range $time_bf_on $time_bf_off; }
 
 drop table t;