summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-01-21 21:07:59 +0200
committermonty@mashka.mysql.fi <>2003-01-21 21:07:59 +0200
commit25c393a12ea7264f265f958027d6e0a1735acc77 (patch)
treeb3f7b07e6d74a88c6ef0b3e8f43bc27b784bb24d /sql/sql_lex.cc
parent6522ee6c9845cf61903592e9a36c78dc4f69f569 (diff)
downloadmariadb-git-25c393a12ea7264f265f958027d6e0a1735acc77.tar.gz
Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index e4fc3a5aec3..716e37b5cb7 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -21,7 +21,6 @@
#include "item_create.h"
#include <m_ctype.h>
#include <hash.h>
-#include <assert.h>
LEX_STRING tmp_table_alias= {(char*) "tmp-table",8};
@@ -235,7 +234,9 @@ static LEX_STRING get_quoted_token(LEX *lex,uint length, char quote)
yyUnget(); // ptr points now after last token char
tmp.length=lex->yytoklen=length;
tmp.str=(char*) lex->thd->alloc(tmp.length+1);
- for (from= (byte*) lex->tok_start, to= tmp.str, end= to+length ; to != end ;)
+ for (from= (byte*) lex->tok_start, to= (byte*) tmp.str, end= to+length ;
+ to != end ;
+ )
{
if ((*to++= *from++) == quote)
from++; // Skip double quotes