Merge 'trunk' into 'sybase'

r5341@hlagh (orig r6508):  ribasushi | 2009-06-04 13:54:28 -0700
having without group_by is useless - thus do not supply a group_by on count, let things die
r5343@hlagh (orig r6510):  ribasushi | 2009-06-04 14:51:13 -0700
It seems that this localisation can lead to problems
Unfortunately no test case as the trigger was buried deep within Reaction, I coulnd't figure out an isolation