Commit bf446ae4 authored by unknown's avatar unknown

Moved state_map copying to THD::THD().


sql/sql_lex.cc:
  Changed serg's fix back.
parent 80462011
......@@ -133,6 +133,10 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
}
#endif
// copy global state map into thread
for(int x=0; x < 256; x++)
state_map[x] = global_state_map[x];
#ifdef __WIN__
real_id = 0 ;
#endif
......
......@@ -425,7 +425,7 @@ int yylex(void *arg)
uint length;
enum lex_states state,prev_state;
LEX *lex=current_lex;
uchar *state_map = global_state_map; // thd->lex->state_map;
uchar *state_map = lex->thd->state_map;
YYSTYPE *yylval=(YYSTYPE*) arg;
lex->yylval=yylval; // The global state
......
......@@ -512,10 +512,6 @@ pthread_handler_decl(handle_one_connection,arg)
return 0;
}
// copy global state map into thread
for(int x=0; x < 256; x++)
thd->state_map[x] = global_state_map[x];
do
{
int error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment