- Add  missing drop(s)
 - Reset changed variables

NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl