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/r/sp-error.result | |
| 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/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 16f39e39a46..0f043a73f85 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -982,9 +982,9 @@ ERROR HY000: Explicit or implicit commit is not allowed in stored function or tr CREATE FUNCTION bug_13627_f() returns int BEGIN create view v1 as select 1; return 1; END | ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW BEGIN alter view v1 as select 1; END | -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR 0A000: ALTER VIEW is not allowed in stored procedures CREATE FUNCTION bug_13627_f() returns int BEGIN alter view v1 as select 1; return 1; END | -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR 0A000: ALTER VIEW is not allowed in stored procedures CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW BEGIN drop view v1; END | ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. CREATE FUNCTION bug_13627_f() returns int BEGIN drop view v1; return 1; END | |