diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
| commit | 8b3081fbe82f72837b59cf0369cfb87b5b4e337f (patch) | |
| tree | 58da2b1b1437e48f3ad5b672bc3afd7d72d95e21 /mysql-test/r/view.result | |
| parent | 6617c77c4523c6a176797a9b76c79c8e60cf28f8 (diff) | |
| parent | 0c8e312caf22ed47b40148cfee4f98876c9176af (diff) | |
| download | mariadb-git-8b3081fbe82f72837b59cf0369cfb87b5b4e337f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sp.cc:
Manual merge.
sql/sp.h:
Manual merge.
sql/sql_base.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/view.result')
| -rw-r--r-- | mysql-test/r/view.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 4385a23416d..6393cf89e1e 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1933,11 +1933,11 @@ create function f1 () returns int return (select max(col1) from t1); DROP TABLE t1; CHECK TABLE v1, v2, v3, v4, v5, v6; Table Op Msg_type Msg_text -test.v1 check error Table 'test.t1' doesn't exist +test.v1 check error View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them test.v2 check status OK -test.v3 check error Table 'test.t1' doesn't exist +test.v3 check error View 'test.v3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them test.v4 check status OK -test.v5 check error Table 'test.t1' doesn't exist +test.v5 check error View 'test.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them test.v6 check status OK drop function f1; drop function f2; |