mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user