bug #3579 NOW() function incorrectly selected (partial regression)
Merge branch 'QA_4_0'