Reaction of a alpha-hydrogen containing carbonyl group with an enolate of an aldehyde or ketone in the presence of suitable base or acid is called aldol reaction (aldol addtion) and the product is called aldol (beta-hydroxyaldehyde) or beta-hydroxyketone.
While the followed dehydration reaction produce a congugate enone and these both reaction (aldol reaction and dehydration) is called aldol condensation