From 81962878d83e159bda413a541291292a1197983d Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.local" <>
Date: Mon, 23 Oct 2006 13:55:29 +0400
Subject: [PATCH] A post-merge fix.

---
 mysql-test/r/view.result | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index e13ec2165b9..6f53a56a4ce 100644
--- a/mysql-test/r/view.result
+++ b/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);