Fix handling of EXECUTE with skip_metadata=false

patch by Aleksey Yeschenko and Jake Luciani; reviewed by Sylvain
Lebresne