database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 3.23.44

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2001-11-04 16:14:09 +02:00
parent 67951fdeb4 65d4c846d8
commit fd0780493d
115 changed files with 3377 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_lex.cc
View File

@ -616,9 +616,30 @@ int yylex(void *arg)
return(IDENT);
case STATE_USER_VARIABLE_DELIMITER:
lex->tok_start=lex->ptr; // Skip first `
while ((c=yyGet()) && state_map[c] != STATE_USER_VARIABLE_DELIMITER &&
c != (uchar) NAMES_SEP_CHAR) ;
lex->tok_start=lex->ptr; // Skipp first `
#ifdef USE_MB
if (use_mb(default_charset_info))
{
while ((c=yyGet()) && state_map[c] != STATE_USER_VARIABLE_DELIMITER &&
c != (uchar) NAMES_SEP_CHAR)
{
if (my_ismbhead(default_charset_info, c))
{
int l;
if ((l = my_ismbchar(default_charset_info,
(const char *)lex->ptr-1,
(const char *)lex->end_of_query)) == 0)
break;
lex->ptr += l-1;
}
}
}
else
#endif
{
while ((c=yyGet()) && state_map[c] != STATE_USER_VARIABLE_DELIMITER &&
c != (uchar) NAMES_SEP_CHAR) ;
}
yylval->lex_str=get_token(lex,yyLength());
if (lex->convert_set)
lex->convert_set->convert((char*) yylval->lex_str.str,lex->yytoklen);