diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:30:59 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:30:59 +0400 |
| commit | 788c31022ee2240780a794db7e360f78aa1b39ee (patch) | |
| tree | 5ff951a3092cba90ee52ccbfa765fd1b5fa29e5a /mysql-test/t/sp-error.test | |
| parent | 8acc9a961211fe96f5a57e5c9fad4cbc0af61445 (diff) | |
| download | mariadb-git-788c31022ee2240780a794db7e360f78aa1b39ee.tar.gz | |
Fix after manual merge.
mysql-test/r/sp-error.result:
After merge fix.
mysql-test/t/sp-error.test:
Fix delimiter restoration.
Diffstat (limited to 'mysql-test/t/sp-error.test')
| -rw-r--r-- | mysql-test/t/sp-error.test | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index bd89b1b7344..8754d9ca82d 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -1770,27 +1770,6 @@ END; # -# End of 5.0 tests -# ---echo End of 5.0 tests - -# -# Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in -# stored functions/triggers -# ---disable_warnings -drop function if exists bug16164; ---enable_warnings -delimiter |; ---error ER_SP_NO_RETSET -create function bug16164() returns int -begin - show authors; - return 42; -end| - - -# # BUG#20953: create proc with a create view that uses local # vars/params should fail to create # @@ -1832,10 +1811,32 @@ DROP TABLE t1; # +# End of 5.0 tests +# +--echo End of 5.0 tests + +# +# Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in +# stored functions/triggers +# +--disable_warnings +drop function if exists bug16164; +--enable_warnings +delimiter |; +--error ER_SP_NO_RETSET +create function bug16164() returns int +begin + show authors; + return 42; +end| +delimiter ;| + + +# # BUG#20701: BINARY keyword should be forbidden in stored routines # --disable_warnings -drop function if exists bug20701| +drop function if exists bug20701; --enable_warnings # # This was disabled in 5.1.12. See bug #20701 @@ -1843,17 +1844,19 @@ drop function if exists bug20701| # be removed. # --error ER_NOT_SUPPORTED_YET -create function bug20701() returns varchar(25) binary return "test"| -create function bug20701() returns varchar(25) return "test"| -drop function bug20701| +create function bug20701() returns varchar(25) binary return "test"; +create function bug20701() returns varchar(25) return "test"; +drop function bug20701; + + --echo End of 5.1 tests # # BUG#NNNN: New bug synopsis # #--disable_warnings -#drop procedure if exists bugNNNN| -#drop function if exists bugNNNN| +#drop procedure if exists bugNNNN; +#drop function if exists bugNNNN; #--enable_warnings #create procedure bugNNNN... #create function bugNNNN... |