Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged

mysql-test/include/mix1.inc

@@ -441,6 +441,7 @@ flush tables;
 select * from test;
 disconnect con2;
 connection default;
+drop table test;
 set global query_cache_type=@save_qcache_type;
 set global query_cache_size=@save_qcache_size;
 

mysql-test/r/innodb_mysql.result

@@ -410,6 +410,7 @@ flush tables;
 select * from test;
 test1	test2
 tes	1234
+drop table test;
 set global query_cache_type=@save_qcache_type;
 set global query_cache_size=@save_qcache_size;
 End of 5.0 tests