MDEV-17306 rw_lock_x_lock_wait_func() double increments rw_x_spin_round_count

kevgs · kevgs · commit 0f709912fbbd · 2018-09-27T17:57:27.000+03:00
rw_lock_x_lock_wait_func(): remove duplicated logic added in incorrect merge

Affected counters are affected by InnoDB monitor. But they aren't stable and thus
can not be realiably tested.
diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc
@@ -495,14 +495,6 @@ rw_lock_x_lock_wait_func(
 		lock->count_os_wait += static_cast<uint32_t>(count_os_wait);
 		rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);
 	}
-
-	rw_lock_stats.rw_x_spin_round_count.add(n_spins);
-
-	if (count_os_wait > 0) {
-		lock->count_os_wait +=
-			static_cast<uint32_t>(count_os_wait);
-		rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);
-	}
 }
 
 #ifdef UNIV_DEBUG

Original file line number	Diff line number	Diff line change
`@@ -495,14 +495,6 @@ rw_lock_x_lock_wait_func(`
`495`	`495`	`lock->count_os_wait += static_cast<uint32_t>(count_os_wait);`
`496`	`496`	`rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);`
`497`	`497`	`}`
`498`		`-`
`499`		`- rw_lock_stats.rw_x_spin_round_count.add(n_spins);`
`500`		`-`
`501`		`- if (count_os_wait > 0) {`
`502`		`- lock->count_os_wait +=`
`503`		`- static_cast<uint32_t>(count_os_wait);`
`504`		`- rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);`
`505`		`- }`
`506`	`498`	`}`
`507`	`499`
`508`	`500`	`#ifdef UNIV_DEBUG`