database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix after manual merge.

Browse Source 
mysql-test/r/sp-error.result:
  After merge fix.
mysql-test/t/sp-error.test:
  Fix delimiter restoration.
This commit is contained in:
unknown
2006-10-12 18:30:59 +04:00
parent 8acc9a9612
commit 788c31022e
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/sp-error.result
View File

@ -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