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 /mysql-test/t/ps_1general.test | |
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 'mysql-test/t/ps_1general.test')
-rw-r--r-- | mysql-test/t/ps_1general.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 9905d73fc32..13773504fb0 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -414,6 +414,10 @@ prepare stmt1 from ' execute stmt2 ' ; --error ER_UNSUPPORTED_PS prepare stmt1 from ' deallocate prepare never_prepared ' ; +## We don't support alter view as prepared statements +--error ER_UNSUPPORTED_PS +prepare stmt1 from 'alter view v1 as select 2'; + ## switch the database connection --error ER_UNSUPPORTED_PS prepare stmt4 from ' use test ' ; |