diff options
| author | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2015-07-10 07:54:55 +0530 |
|---|---|---|
| committer | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2015-07-10 07:54:55 +0530 |
| commit | c773b320ffce5fa51782b26c979bda23dd8dbc03 (patch) | |
| tree | 43664139b8bc731b83082285ee1d5738dbf38a8e /sql/sql_yacc.yy | |
| parent | 7255ae6ceb20c67d09fd153558d9a14372142f8b (diff) | |
| parent | 33a2e5abd86727155b629246445d508bb2cd02c0 (diff) | |
| download | mariadb-git-c773b320ffce5fa51782b26c979bda23dd8dbc03.tar.gz | |
Merge branch 'mysql-5.1' into mysql-5.5
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b32f7d26cf3..cd86f96900e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -11932,7 +11932,9 @@ literal: str ? str->length() : 0, $1); if (!item_str || - !item_str->check_well_formed_result(&item_str->str_value, TRUE)) + !item_str->check_well_formed_result(&item_str->str_value, + true, //send error + true)) //truncate { MYSQL_YYABORT; } @@ -11961,7 +11963,9 @@ literal: str ? str->length() : 0, $1); if (!item_str || - !item_str->check_well_formed_result(&item_str->str_value, TRUE)) + !item_str->check_well_formed_result(&item_str->str_value, + true, //send error + true)) //truncate { MYSQL_YYABORT; } |