summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-04-06 11:53:15 +0500
committerunknown <bar@mysql.com>2005-04-06 11:53:15 +0500
commit5687fe36bf21add03b96871215c58bd2e12a4666 (patch)
treee7ff1b9199a6be79542bbe6fbdf4588d1e054d48 /sql/sql_yacc.yy
parent81125bc8ceb2de09fb0db1851ca80edb45b290e2 (diff)
downloadmariadb-git-5687fe36bf21add03b96871215c58bd2e12a4666.tar.gz
Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9f25e17b6fd..dcda19a7080 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5032,9 +5032,10 @@ IDENT_sys:
if (thd->charset_is_system_charset)
{
CHARSET_INFO *cs= system_charset_info;
+ int dummy_error;
uint wlen= cs->cset->well_formed_len(cs, $1.str,
$1.str+$1.length,
- $1.length);
+ $1.length, &dummy_error);
if (wlen < $1.length)
{
net_printf(YYTHD, ER_INVALID_CHARACTER_STRING, cs->csname,