MDEV-35486 : MDEV-33997 test failed

janlindstrom · sysprg · commit f5aed7457348 · 2024-11-27T13:00:08.000+01:00
Problem was that at wsrep_to_isolation_end saved_lock_wait_timeout
variable was set to thd-&gt;variables.lock_wait_timeout when RSU
is used and variable value was 0 leading sporadic lock wait timeout
errors. Fixed by removing incorrect variable set.

Signed-off-by: Julius Goryavsky &lt;julius.goryavsky@mariadb.com&gt;
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
@@ -3077,7 +3077,6 @@ void wsrep_to_isolation_end(THD *thd)
   }
   else if (wsrep_thd_is_in_rsu(thd))
   {
-    thd->variables.lock_wait_timeout= thd->variables.saved_lock_wait_timeout;
     DBUG_ASSERT(wsrep_OSU_method_get(thd) == WSREP_OSU_RSU);
     wsrep_RSU_end(thd);
   }

Original file line number	Diff line number	Diff line change
`@@ -3077,7 +3077,6 @@ void wsrep_to_isolation_end(THD *thd)`
`3077`	`3077`	`}`
`3078`	`3078`	`else if (wsrep_thd_is_in_rsu(thd))`
`3079`	`3079`	`{`
`3080`		`- thd->variables.lock_wait_timeout= thd->variables.saved_lock_wait_timeout;`
`3081`	`3080`	`DBUG_ASSERT(wsrep_OSU_method_get(thd) == WSREP_OSU_RSU);`
`3082`	`3081`	`wsrep_RSU_end(thd);`
`3083`	`3082`	`}`