database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
This commit is contained in:
bar@bar.myoffice.izhnet.ru
2007-08-03 17:16:02 +05:00
parent f42cf05ad4 4eebfd09c2
commit fb8dff9721
20 changed files with 431 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_lex.cc
View File

@ -498,10 +498,12 @@ static char *get_text(Lex_input_stream *lip, int pre_skip, int post_skip)
uint found_escape=0;
CHARSET_INFO *cs= lip->m_thd->charset();
lip->tok_bitmap= 0;
sep= lip->yyGetLast(); // String should end with this
while (! lip->eof())
{
c= lip->yyGet();
lip->tok_bitmap|= c;
#ifdef USE_MB
{
int l;
@ -815,6 +817,7 @@ int MYSQLlex(void *arg, void *yythd)
break;
}
yylval->lex_str.length= lip->yytoklen;
lex->text_string_is_7bit= (lip->tok_bitmap & 0x80) ? 0 : 1;
return(NCHAR_STRING);
case MY_LEX_IDENT_OR_HEX:
@ -1178,6 +1181,7 @@ int MYSQLlex(void *arg, void *yythd)
lip->m_underscore_cs= NULL;
lex->text_string_is_7bit= (lip->tok_bitmap & 0x80) ? 0 : 1;
return(TEXT_STRING);
case MY_LEX_COMMENT: // Comment