I did read the sorcerer's stone almost 10 years ago, excuse me if details are not as present in my mind :P
I kind of thought they had the fight in the bathroom where moaning myrtle was killed... But I guess it wasnt... I also im pretty sure there was another troll in Harry Potter... cant remember in which book though.