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

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index 7415f3ef56a..36c18979154 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -178,7 +178,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.)
@@ -242,7 +242,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";
@@ -257,7 +257,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;