diff options
author | Matthias Leich mleich@mysql.com <Unknown> | 2008-06-03 12:21:48 +0200 |
---|---|---|
committer | Matthias Leich mleich@mysql.com <Unknown> | 2008-06-03 12:21:48 +0200 |
commit | 8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93 (patch) | |
tree | 1fdcef9d15d2faa857ca708ae49bacbc511c51fd /mysql-test/t/func_misc.test | |
parent | c392457f7c234f55dfb74104771b216b15458383 (diff) | |
parent | 15440264430b8dd7c10d950926a34f8f20f14427 (diff) | |
download | mariadb-git-8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93.tar.gz |
Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Diffstat (limited to 'mysql-test/t/func_misc.test')
-rw-r--r-- | mysql-test/t/func_misc.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 25fe0ef521c..8e995c2da9c 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -187,7 +187,7 @@ SET @sleep_time_per_result_row = 1; SET @max_acceptable_delay = 2; # TIMEDIFF = time for query with sleep (mostly the time caused by SLEEP) # + time for delays caused by high load on testing box -# Ensure that at least a reasonable fraction of TIMEDIFF is belongs to the SLEEP +# Ensure that at least a reasonable fraction of TIMEDIFF belongs to the SLEEP # by appropriate setting of variables. # Ensure that any "judging" has a base of minimum three attempts. # (Test 2 uses all attempts except the first one.) @@ -251,7 +251,7 @@ while ($num) # -> total runtime is clear more needed than for one result row needed # = Replacement for one of the original Bug#12689 tests --echo # Test 1: Does the query with SLEEP need a reasonable time? -eval SELECT COUNT(*) > $loops - 1 INTO @aux1 FROM t_history +eval SELECT COUNT(*) >= $loops - 1 INTO @aux1 FROM t_history WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count BETWEEN 0 AND @max_acceptable_delay; SELECT @aux1 AS "Expect 1"; @@ -266,7 +266,7 @@ SELECT @aux1 AS "Expect 1"; # = Replacement for one of the original Bug#12689 tests --echo # Test 2: Does the query with SLEEP need a reasonable time even in case --echo # of the non first execution? -eval SELECT COUNT(*) > $loops - 1 - 1 INTO @aux2 FROM t_history +eval SELECT COUNT(*) >= $loops - 1 - 1 INTO @aux2 FROM t_history WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count BETWEEN 0 AND @max_acceptable_delay AND attempt > 1; |