A post-merge fix.

mysql-test/r/view.result

@@ -2968,6 +2968,8 @@ INSERT INTO t1 VALUES (1);
 CREATE FUNCTION f1() RETURNS INT RETURN (SELECT * FROM v1);
 UPDATE t1 SET i= f1();
 DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1;
 CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL);
 CREATE VIEW v1 AS SELECT id, val FROM t1 WHERE val >= 1 AND val <= 5 WITH CHECK OPTION;
 INSERT INTO v1 (val) VALUES (2);