5522 first commit with mysqli updates