database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Upmerge of fix for

Browse Source 
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
This commit is contained in:
Matthias Leich mleich@mysql.com
2008-06-03 12:21:48 +02:00
parent 7fe7e4318b be574a3a57
commit 6fec7fc19a
71 changed files with 3365 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/func_misc.result
View File

@ -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;