Support DDL and empty select statements in SQL stats collection.

Summary: At the moment, any code performing one a DDL (create, alter, drop table)
and/or any code doing tableless selects (like SELECT 1; or SELECT
MASTER_LOG_POS...) will cause HHVM to issue a warning and not update the
statistics.

This patch should add support for those. Closes #3760
Closes https://github.com/facebook/hhvm/pull/3761

Reviewed By: @fredemmott

Differential Revision: D1558110
Combine ini and hdf options into two shorter long form options in the wrapper

Summary: Let's just have two options `ini` and `hdf` and be a little smarter about checking
whether we have a file or command line option

Reviewed By: @jdelong

Differential Revision: D1565208
Mockery 0.9.2 update

Summary: This replaces #3676.
Closes https://github.com/facebook/hhvm/pull/3736

Reviewed By: @sgolemon

Differential Revision: D1553430

Pulled By: @fredemmott