diff options
| author | Matthias Leich mleich@mysql.com <> | 2008-06-03 12:21:48 +0200 |
|---|---|---|
| committer | Matthias Leich mleich@mysql.com <> | 2008-06-03 12:21:48 +0200 |
| commit | 6fec7fc19a58e6ebf98cdd41f78e416fcdb34926 (patch) | |
| tree | 1fdcef9d15d2faa857ca708ae49bacbc511c51fd /mysql-test/r/func_misc.result | |
| parent | 7fe7e4318b2a09bc25459d81cb7d9757c82a0710 (diff) | |
| parent | be574a3a571eb801cdd9db3e4c1e57a44fd45801 (diff) | |
| download | mariadb-git-6fec7fc19a58e6ebf98cdd41f78e416fcdb34926.tar.gz | |
Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Diffstat (limited to 'mysql-test/r/func_misc.result')
| -rw-r--r-- | mysql-test/r/func_misc.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 1c41b6e67c1..c35c2eaccd7 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -173,7 +173,7 @@ WHERE attempt = 4 - 1 + 1; UPDATE t_history SET end_cached = 0 WHERE attempt = 4 - 1 + 1; # Test 1: Does the query with SLEEP need a reasonable time? -SELECT COUNT(*) > 4 - 1 INTO @aux1 FROM t_history +SELECT COUNT(*) >= 4 - 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"; @@ -181,7 +181,7 @@ Expect 1 1 # Test 2: Does the query with SLEEP need a reasonable time even in case # of the non first execution? -SELECT COUNT(*) > 4 - 1 - 1 INTO @aux2 FROM t_history +SELECT COUNT(*) >= 4 - 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; |