diff options
| author | unknown <andrey@lmy004.> | 2006-08-09 17:19:39 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-08-09 17:19:39 +0200 |
| commit | b60873b10df5b16071ae5050aa5041cb772f252f (patch) | |
| tree | afc063439f2b0976808cc2b0d6304aca9193d74c /sql/sql_yacc.yy | |
| parent | 29701579b346a981faa10fa01b2c666a03457a94 (diff) | |
| parent | 0231ca09b52bab67e2a351505b00b03a83cdf939 (diff) | |
| download | mariadb-git-b60873b10df5b16071ae5050aa5041cb772f252f.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into lmy004.:/work/mysql-5.1-runtime
sql/sp.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
manual merge
mysql-test/t/sp.test:
manual merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b8d68a91afc..4fd4572e58b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1672,6 +1672,17 @@ create_function_tail: { LEX *lex= Lex; sp_head *sp= lex->sphead; + /* + This was disabled in 5.1.12. See bug #20701 + When collation support in SP is implemented, then this test + should be removed. + */ + if (($8 == FIELD_TYPE_STRING || $8 == MYSQL_TYPE_VARCHAR) + && (lex->type & BINCMP_FLAG)) + { + my_error(ER_NOT_SUPPORTED_YET, MYF(0), "return value collation"); + YYABORT; + } if (sp->fill_field_definition(YYTHD, lex, (enum enum_field_types) $8, |