- Add  missing drop(s)
 - Reset changed variables

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

Remove workarounds for "hang in select"

Change to use 0.1 second sleep between kill attempt

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
Add verbose printouts

Add list of clusters and nodes

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

Remove extra call to vio_end

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  mysql.com:/data0/knielsen/tmp-5.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  mysql.com:/usr/local/mysql/merge-5.1

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0

  Adjusted merge

Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not.

into  mysql.com:/tmp/mysql-5.1-new

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0