Moved state_map copying to THD::THD().
This commit is contained in:
parent
555430819d
commit
1b9ce04050
@ -133,6 +133,10 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// copy global state map into thread
|
||||||
|
for(int x=0; x < 256; x++)
|
||||||
|
state_map[x] = global_state_map[x];
|
||||||
|
|
||||||
#ifdef __WIN__
|
#ifdef __WIN__
|
||||||
real_id = 0 ;
|
real_id = 0 ;
|
||||||
#endif
|
#endif
|
||||||
|
@ -425,7 +425,7 @@ int yylex(void *arg)
|
|||||||
uint length;
|
uint length;
|
||||||
enum lex_states state,prev_state;
|
enum lex_states state,prev_state;
|
||||||
LEX *lex=current_lex;
|
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;
|
YYSTYPE *yylval=(YYSTYPE*) arg;
|
||||||
|
|
||||||
lex->yylval=yylval; // The global state
|
lex->yylval=yylval; // The global state
|
||||||
|
@ -512,10 +512,6 @@ pthread_handler_decl(handle_one_connection,arg)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy global state map into thread
|
|
||||||
for(int x=0; x < 256; x++)
|
|
||||||
thd->state_map[x] = global_state_map[x];
|
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user