summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_misc.result
diff options
context:
space:
mode:
authorMatthias Leich mleich@mysql.com <>2008-06-02 21:57:11 +0200
committerMatthias Leich mleich@mysql.com <>2008-06-02 21:57:11 +0200
commitbe574a3a571eb801cdd9db3e4c1e57a44fd45801 (patch)
treeaa83fd798596f98659faca7e6b3068a428e6216f /mysql-test/r/func_misc.result
parent361dcb1a90a40e2ff0e01c34c082d89ed983747a (diff)
downloadmariadb-git-be574a3a571eb801cdd9db3e4c1e57a44fd45801.tar.gz
Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Fix for this bug and additional improvements/fixes In detail: - Remove unicode attribute from several columns (unicode properties were nowhere needed/tested) of the table tb3 -> The runnability of these tests depends no more on the availibility of some optional collations. - Use a table tb3 with the same layout for all engines to be tested and unify the engine name within the protocols. -> <engine>_trig_<abc>.result have the same content - Do not load data into tb3 if these rows have no impact on result sets - Add tests for NDB (they exist already in 5.1) - "--replace_result" at various places because NDB variants of tests failed with "random" row order in results This fixes a till now unknown weakness within the funcs_1 NDB tests existing in 5.1 and 6.0 - Fix the expected result of ndb_trig_1011ext which suffered from Bug 32656 + disable this test - funcs_1 could be executed with the mysql-test-run.pl option "--reorder", which saves some runtime by optimizing server restarts. Runtimes on tmpfs (one attempt only): with reorder 132 seconds without reorder 183 seconds - Adjust two "check" statements within func_misc.test which were incorrect (We had one run with result set difference though the server worked good.) - minor fixes in comments
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r--mysql-test/r/func_misc.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 0cf2eb9323a..d50dda55bfb 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -168,7 +168,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";
@@ -176,7 +176,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;