diff options
| author | unknown <gkodinov/kgeorge@macbook.local> | 2007-09-22 11:42:01 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.local> | 2007-09-22 11:42:01 +0200 |
| commit | 18397a5dc3d1a514629b4604835fa38d8717d0d2 (patch) | |
| tree | b33a138d1e789ea155e8578d198ae06c59eac00c /sql/sql_view.cc | |
| parent | f7f10959084aa815e1e4f10b6dc02aafa9de588b (diff) | |
| parent | 053907318516bb8d25f5ae8cb0367d1ebd327158 (diff) | |
| download | mariadb-git-18397a5dc3d1a514629b4604835fa38d8717d0d2.tar.gz | |
Merge macbook.local:/Users/kgeorge/mysql/work/B28701-5.0-opt
into macbook.local:/Users/kgeorge/mysql/work/B28701-merged-5.0-opt
sql/sql_view.cc:
Auto merged
mysql-test/r/view.result:
merge with 5.0-opt
mysql-test/t/view.test:
merge with 5.0-opt
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 35a97411511..b938818000e 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -925,6 +925,15 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, DBUG_RETURN(0); } + if (table->use_index || table->ignore_index) + { + my_error(ER_WRONG_USAGE, MYF(0), + table->ignore_index ? "IGNORE INDEX" : + (table->force_index ? "FORCE INDEX" : "USE INDEX"), + "VIEW"); + DBUG_RETURN(TRUE); + } + /* check loop via view definition */ for (TABLE_LIST *precedent= table->referencing_view; precedent; |