Revert "Don't modify the connection's query_options with options set on a single query. Issue #243."

This reverts commit 3aa46fce7781e5478c7ef8e531443dca7e7e87ad.
Revert "wait to free mysql* handle until we're freed"

This reverts commit 14c6bed2d8ed1e1556b13d48bdccdb8f44d6c8b2.