Merge remote-tracking branch 'upstream/master'
bug fixed for classloader
Merge branch 'master' of https://github.com/wenshao/druid
support odps udtf expr
Merge pull request #493 from wenshao/master

bug fixed for classloader & support odps
support text [CHARACTER SET charset_name] [COLLATE collation_name]
result filter && tenant support
improve sql wall
merge
merge pull request
:Merge remote-tracking branch 'upstream/master' into cutedemons-master
resolve conflict
Merge pull request #495 from cutedemons/master

	resolve conflict
resultset proxy
Merge pull request #496 from cutedemons/master

resultset proxy
resultset metadata proxy
Merge pull request #497 from cutedemons/master

resultset metadata proxy
fix bug
Merge pull request #498 from cutedemons/master

fix bug