database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge with 3.23.42

Browse Source
This commit is contained in:
monty@work.mysql.com
2001-09-13 09:52:35 +02:00
parent 08df09230f c946439d6c
commit 18474d8419
56 changed files with 832 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_lex.cc
View File

@@ -820,9 +820,19 @@ int yylex(void *arg)
}
break;
case STATE_USER_END: // end '@' of user@hostname
if (state_map[yyPeek()] != STATE_STRING &&
state_map[yyPeek()] != STATE_USER_VARIABLE_DELIMITER)
lex->next_state=STATE_HOSTNAME; // Mark for next loop
switch (state_map[yyPeek()])
{
case STATE_STRING:
case STATE_USER_VARIABLE_DELIMITER:
break;
case STATE_USER_END:
lex->next_state=STATE_USER_END;
yySkip();
break;
default:
lex->next_state=STATE_HOSTNAME;
break;
}
yylval->lex_str.str=(char*) lex->ptr;
yylval->lex_str.length=1;
return((int) '@');