Importing a fix to a segfault.
Fixing the test to actually test something.
Merge branch 'master' of github.com:youtube/vitess