"Embedded SELECT without FOR UPDATE is causing a lock" into 5.5 tree. One of 5.5 trees already contains a more thorough version of the fix.
