Merge Ehud's MySQL users support (bug #1815)