Fixed expected data and a typo in a query.
Merge branch 'master' of https://github.com/zhiyongliu/incubator-drill