diff options
| author | unknown <gkodinov/kgeorge@macbook.local> | 2007-09-24 13:02:59 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.local> | 2007-09-24 13:02:59 +0200 |
| commit | c2c760bdb60eaa22165b518c209381010d489604 (patch) | |
| tree | 831c2a88763c5868f26a24c76231bed45827b607 /sql/sql_view.cc | |
| parent | ea1a4ae287f0ecb62fc45955d117b1e30bcbf38f (diff) | |
| download | mariadb-git-c2c760bdb60eaa22165b518c209381010d489604.tar.gz | |
merging bug 28701 to 5.1-opt
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index c1149ab63b9..9e16a5e31ee 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -953,12 +953,9 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, DBUG_RETURN(0); } - if (table->use_index || table->ignore_index) + if (table->index_hints && table->index_hints->elements) { - my_error(ER_WRONG_USAGE, MYF(0), - table->ignore_index ? "IGNORE INDEX" : - (table->force_index ? "FORCE INDEX" : "USE INDEX"), - "VIEW"); + my_error(ER_WRONG_USAGE, MYF(0), "index hints", "VIEW"); DBUG_RETURN(TRUE); } |