fixed mysqlng problems on newer servers
fixed conflicts