Only passing and logging extra env, not all of env, in tests.
Merge branch 'master' into replication
tabletmanager: add more keyrange restrictions on queries.

Change the tabletmanager to add query rules against update and delete to
check the keyspace_id if it's present. Previously, only inserts were
checked.
Add/Fix shard_conn error logging
Merge branch 'master' of github.com:youtube/vitess
Export GTID fields so MysqlFlavor can access the internals.
Add IDPool for assigning and recycling unique slave IDs.
Add channel-based shutdown signaling to ServiceManager.
Add mysql.ForceQuit() to close mysql connection at socket level.
Connect to mysqld as a slave to stream binlogs instead of polling files.
Merge branch 'master' of https://github.com/youtube/vitess
Make KeyspaceId a Stringer.

This allows for human-readable keyspace IDs, rather than invalid-unicode
binary blobs in logs.
Merge pull request #72 from plobsing/keyspace-id-string

Make KeyspaceId a Stringer.
Log unexpected ROLLBACK in real binlog stream.
Add tests for 'SET INSERT_ID' and INTVAR_EVENT.
Update keyspace.py so not depending on shard order
Update keyspace.py to use Name field from shard
Merge branch 'master' of https://github.com/youtube/vitess
Add logging for missing shard
Allow plugin files to add subprocess flags for site-local packages.