Added session vars for the disk-based join stuff.
Merge branch 'develop' of git://github.com/infinidb/mysql into develop