sql_lex.cc:

Use LEX charset instead of system one sql/sql_lex.cc: Use LEX charset instead of system one

sql_lex.cc:
Use LEX charset instead of system one sql/sql_lex.cc: Use LEX charset instead of system one
23c774bc · unknown · aad26453 · 23c774bc
Commit 23c774bc authored Mar 15, 2003 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

sql/sql_lex.cc sql/sql_lex.cc +5 -4

No files found.
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -209,6 +209,7 @@ static char *get_text(LEX *lex)
 {
  reg1 uchar c,sep;
  uint found_escape=0;
+  CHARSET_INFO *cs= lex->thd->variables.thd_charset;

  sep= yyGetLast();			// String should end with this
  //lex->tok_start=lex->ptr-1;		// Remember '
@@ -217,8 +218,8 @@ static char *get_text(LEX *lex)
    c = yyGet();
 #ifdef USE_MB
    int l;
-    if (use_mb(system_charset_info) &&
-        (l = my_ismbchar(system_charset_info,
+    if (use_mb(cs) &&
+        (l = my_ismbchar(cs,
                         (const char *)lex->ptr-1,
                         (const char *)lex->end_of_query))) {
 	lex->ptr += l-1;
@@ -262,8 +263,8 @@ static char *get_text(LEX *lex)
 	{
 #ifdef USE_MB
 	  int l;
-	  if (use_mb(system_charset_info) &&
-              (l = my_ismbchar(system_charset_info,
+	  if (use_mb(cs) &&
+              (l = my_ismbchar(cs,
                               (const char *)str, (const char *)end))) {
 	      while (l--)
 		  *to++ = *str++;