MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replication causing replication to fail.

knielsen · knielsen · commit 92577cc0ebb7 · 2014-07-08T14:54:53.000+02:00
Fix small (but nasty) typo.
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -4057,7 +4057,7 @@ mysql_report_waiters(struct thd_wait_reports *waitee_buf_ptr,
 		}
 		q = p->next;
 		if (p != waitee_buf_ptr)
-			mem_free(q);
+			mem_free(p);
 		p = q;
 	}
 }
diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc
@@ -4080,7 +4080,7 @@ mysql_report_waiters(struct thd_wait_reports *waitee_buf_ptr,
 		}
 		q = p->next;
 		if (p != waitee_buf_ptr)
-			mem_free(q);
+			mem_free(p);
 		p = q;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -4057,7 +4057,7 @@ mysql_report_waiters(struct thd_wait_reports *waitee_buf_ptr,`
`4057`	`4057`	`}`
`4058`	`4058`	`q = p->next;`
`4059`	`4059`	`if (p != waitee_buf_ptr)`
`4060`		`- mem_free(q);`
	`4060`	`+ mem_free(p);`
`4061`	`4061`	`p = q;`
`4062`	`4062`	`}`
`4063`	`4063`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4080,7 +4080,7 @@ mysql_report_waiters(struct thd_wait_reports *waitee_buf_ptr,`
`4080`	`4080`	`}`
`4081`	`4081`	`q = p->next;`
`4082`	`4082`	`if (p != waitee_buf_ptr)`
`4083`		`- mem_free(q);`
	`4083`	`+ mem_free(p);`
`4084`	`4084`	`p = q;`
`4085`	`4085`	`}`
`4086`	`4086`	`}`