condition bug fix
add missing spaces
expilcitly define using variables
remove unneeded patch

connect engine build failure for VS2013 is already fixed in MariaDB
10.0.15.