bk commit into 5.0 tree (kostja:1.2292)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-23 13:55:29+04:00, kostja@stripped +1 -0
  A post-merge fix.

  mysql-test/r/view.result@stripped, 2006-10-23 13:55:25+04:00, kostja@stripped +2 -0
    A post-merge fix.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime-merge

--- 1.181/mysql-test/r/view.result	2006-10-23 13:55:38 +04:00
+++ 1.182/mysql-test/r/view.result	2006-10-23 13:55:38 +04:00
@@ -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);