summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-01-09 15:37:59 +0400
committerbar@bar.mysql.r18.ru <>2003-01-09 15:37:59 +0400
commita89df5a09691fbdab3c267a4a3172f29e5611803 (patch)
tree2c12b6fd2894db12083ab482be40e695af20e8f0 /sql/sql_lex.cc
parent4df915a7b50ed4a69f77c7968f437d66f9412d9e (diff)
downloadmariadb-git-a89df5a09691fbdab3c267a4a3172f29e5611803.tar.gz
Separating CHARSET and COLLATION terms
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index c7595c7ec5c..c7c7a97cdc2 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -558,7 +558,7 @@ int yylex(void *arg, void *yythd)
*/
if ((yylval->lex_str.str[0]=='_') &&
- (lex->charset=get_charset_by_name(yylval->lex_str.str+1,MYF(0))))
+ (lex->charset=get_charset_by_csname(yylval->lex_str.str+1,MYF(0))))
return(UNDERSCORE_CHARSET);
else
return(IDENT);