diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 80470e9bcb9..d8a6595854d 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4415,7 +4415,7 @@ option_value:
 	{
 	  THD* thd= YYTHD;
 	  LEX *lex= &thd->lex;
-	  CHARSET_INFO *cs= thd->variables->vars->thd_charset;
+	  CHARSET_INFO *cs= thd->variables.thd_charset;
 	  CHARSET_INFO *cl= $2;
 
 	  if (!cl)