Merge branch 'mysql-8.0-bug37212019' into mysql-8.0

Change-Id: Iddd15a2aab2b4f4dbb6742fa1f9d4c61b65cd79e

Author: Yasufumi Kinoshita

storage/innobase/include/ut0rnd.h

@@ -183,7 +183,17 @@ static inline uint64_t random_from_interval(uint64_t low, uint64_t high) {
 }
 
 static inline uint64_t random_from_interval_fast(uint64_t low, uint64_t high) {
-  return random_from_interval_gen<random_64_fast>(low, high);
+  /* FIXME: To keep backward compatibility with the previous ut_rnd_interval(),
+  high value is not to be returned to keep same behavior for performance tuning
+  parameter.
+  (Bug#37212019: behavior related to innodb_spin_wait_delay changed in 8.0.30)
+  This function is not required accurate randomness, no real problems. */
+
+  if (low == high) {
+    return (low);
+  }
+
+  return random_from_interval_gen<random_64_fast>(low, high - 1);
 }
 
 static inline uint64_t hash_uint64(uint64_t value) {

unittest/gunit/innodb/ut0rnd-t.cc

@@ -369,7 +369,7 @@ static void test_interval_fast_distribution(uint64_t n) {
   const uint64_t max_score = 17000;
 
   for (uint64_t i = 0; i < max_count; i++) {
-    const auto value = ut::random_from_interval_fast(0, n - 1);
+    const auto value = ut::random_from_interval_fast(0, n);
     for (auto target : target_score) {
       if (value == target[0]) {
         target[1]++;