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

fix merge issues

Browse Source 
mysql-test/r/sp.result:
  manual merge
sql/sql_lex.cc:
  merge typo
This commit is contained in:
unknown
2007-04-30 15:36:29 -06:00
parent 2a46eda7d2
commit d2e8f9010f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.cc
View File

@ -328,7 +328,7 @@ static LEX_STRING get_quoted_token(Lex_input_stream *lip,
yyUnget(); // ptr points now after last token char
tmp.length= lip->yytoklen=length;
tmp.str=(char*) lip->m_thd->alloc(tmp.length+1);
from= lip->tok_start + skip
from= lip->tok_start + skip;
to= tmp.str;
end= to+length;
for ( ; to != end; )