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/r/sp-error.result | |
| 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/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index cde4f7d5f3a..d955b69bde2 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1258,9 +1258,9 @@ show authors; return 42; end| ERROR 0A000: Not allowed to return a result set from a function -drop function if exists bug20701| -create function bug20701() returns varchar(25) binary return "test"| +drop function if exists bug20701; +create function bug20701() returns varchar(25) binary return "test"; ERROR 42000: This version of MySQL doesn't yet support 'return value collation' -create function bug20701() returns varchar(25) return "test"| -drop function bug20701| +create function bug20701() returns varchar(25) return "test"; +drop function bug20701; End of 5.1 tests |