Manual merge with facebook version of mysql.

This gives access to extra tables in the information schema that track workload on a per-table basis.
Merge branch 'master' into working