diff options
| author | unknown <thek@adventure.(none)> | 2007-06-22 15:23:51 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-06-22 15:23:51 +0200 |
| commit | a348b3697396e0a6e8ff23a96930aeb3ec4de52a (patch) | |
| tree | 0a6aa8e38ae65fc14aa75e5832e87cea3d012f7b /sql/sql_prepare.cc | |
| parent | 7afb6b58907754697908be4edeee311c56d5f944 (diff) | |
| parent | 099be80130d852179bc4a568990c75ffc950719f (diff) | |
| download | mariadb-git-a348b3697396e0a6e8ff23a96930aeb3ec4de52a.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846
into adventure.(none):/home/thek/Development/cpp/bug28846/my51-bug28846
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/sp-dynamic.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Manual merge 5.0->5.1
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 716ca08beb1..06feb8261fc 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1716,6 +1716,13 @@ static bool check_prepared_statement(Prepared_statement *stmt, res= mysql_test_create_table(stmt); break; + case SQLCOM_CREATE_VIEW: + if (lex->create_view_mode == VIEW_ALTER) + { + my_message(ER_UNSUPPORTED_PS, ER(ER_UNSUPPORTED_PS), MYF(0)); + goto error; + } + break; case SQLCOM_DO: res= mysql_test_do_fields(stmt, tables, lex->insert_list); break; @@ -1769,7 +1776,6 @@ static bool check_prepared_statement(Prepared_statement *stmt, case SQLCOM_ROLLBACK: case SQLCOM_TRUNCATE: case SQLCOM_CALL: - case SQLCOM_CREATE_VIEW: case SQLCOM_DROP_VIEW: case SQLCOM_REPAIR: case SQLCOM_ANALYZE: |