Fixes in odbc and better testing
Authored by: artyom-beilis 2010-11-30
Parent: [r1554]
Child: [r1556]