Added proposed changes for easier diff and added constant for mysql error