Null-merged the 5.1-only version of fix for bug #46947

"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.