Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug7391.4

mysql-test/r/update.result

@@ -203,7 +203,6 @@ colC	colA	colD	colE	colF
 3	4433	10005	492	500
 DROP TABLE t1;
 DROP TABLE t2;
-drop table if exists t1, t2;
 create table t1 (c1 int, c2 char(6), c3 int);
 create table t2 (c1 int, c2 char(6));
 insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);