Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1

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


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged

mysql-test/r/analyze.result

@@ -46,6 +46,7 @@ Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_
 execute stmt1;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
 deallocate prepare stmt1;
+drop table t1;
 create temporary table t1(a int, index(a));
 insert into t1 values('1'),('2'),('3'),('4'),('5');
 analyze table t1;

mysql-test/r/ps.result

@@ -1157,3 +1157,4 @@ test.t1	analyze	status	Table is already up to date
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist
 deallocate prepare stmt;
+drop table t1, t2, t3;

mysql-test/t/analyze.test

@@ -61,6 +61,7 @@ prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";
 execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
+drop table t1;
 
 #
 # bug#15225 (ANALYZE temporary has no effect)

mysql-test/t/ps.test

@@ -1145,5 +1145,5 @@ prepare stmt from "analyze table t4, t1";
 execute stmt;
 execute stmt;
 deallocate prepare stmt;
-
+drop table t1, t2, t3;
 # End of 5.0 tests