MySQL usage for events added
Merge conflict resolved