diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-08-10 16:16:16 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-08-10 16:16:16 +0400 |
| commit | eef51cd83d952b786def92fccde44b41a007c989 (patch) | |
| tree | 392b0b727f59bd9b251ee61915d6ac3d00c4b736 /mysql-test/r/sp-error.result | |
| parent | 3459da7ddcd4f8361eeacc5b6ac5c23a2ec6c67e (diff) | |
| parent | 13475abf8bd24884a6a45e7d8b76b223d1e67d5c (diff) | |
| download | mariadb-git-eef51cd83d952b786def92fccde44b41a007c989.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index bf36b4796b9..63401845f23 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1181,3 +1181,8 @@ 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"| +ERROR 42000: This version of MySQL doesn't yet support 'return value collation' +create function bug20701() returns varchar(25) return "test"| +drop function bug20701| |