bk commit into 5.0 tree (igor:1.1966)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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
  1.1966 05/11/02 22:24:36 igor@stripped +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  mysql-test/t/view.test
    1.119 05/11/02 22:24:31 igor@stripped +10 -11
    Manual merge.

  mysql-test/r/view.result
    1.128 05/11/02 22:24:31 igor@stripped +12 -12
    Manual merge.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0/RESYNC

--- 1.127/mysql-test/r/view.result	2005-11-01 06:24:32 -08:00
+++ 1.128/mysql-test/r/view.result	2005-11-02 22:24:31 -08:00
@@ -2335,3 +2335,22 @@
 1	3,2,1
 drop view v1,v2;
 drop table t1;
+CREATE TABLE t1(id INT);
+CREATE VIEW v1 AS SELECT id FROM t1;
+OPTIMIZE TABLE v1;
+Table	Op	Msg_type	Msg_text
+test.v1	optimize	note	You cannot apply optimize to a view
+ANALYZE TABLE v1;
+Table	Op	Msg_type	Msg_text
+test.v1	analyze	note	You cannot apply analyze to a view
+REPAIR TABLE v1;
+Table	Op	Msg_type	Msg_text
+test.v1	repair	note	You cannot apply repair to a view
+DROP TABLE t1;
+OPTIMIZE TABLE v1;
+Table	Op	Msg_type	Msg_text
+test.v1	optimize	note	You cannot apply optimize to a view
+Warnings:
+Error	1146	Table 'test.t1' doesn't exist
+Error	1356	View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+DROP VIEW v1;

--- 1.118/mysql-test/t/view.test	2005-11-01 06:24:55 -08:00
+++ 1.119/mysql-test/t/view.test	2005-11-02 22:24:31 -08:00
@@ -2200,3 +2200,17 @@
 select * from v2;
 drop view v1,v2;
 drop table t1;
+# Bug #14540: OPTIMIZE, ANALYZE, REPAIR applied to not a view
+#
+
+CREATE TABLE t1(id INT);
+CREATE VIEW v1 AS SELECT id FROM t1;
+
+OPTIMIZE TABLE v1;
+ANALYZE TABLE v1;
+REPAIR TABLE v1;
+
+DROP TABLE t1;
+OPTIMIZE TABLE v1;
+
+DROP VIEW v1;