diff options
| author | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
| commit | 7f158dd12a814e990454eee85fc5fea4d18a8d30 (patch) | |
| tree | 64a6fa388e4aab5527ee4bc81489d6cfac07fcf0 /sql/sql_base.cc | |
| parent | 5b28d4a9a49a2d1c3225044b2cc82aa9e840687f (diff) | |
| parent | 6f6042462933c66f8af0503b32aa62e43f1aaf1f (diff) | |
| download | mariadb-git-7f158dd12a814e990454eee85fc5fea4d18a8d30.tar.gz | |
Merge 4.1 into 5.0
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index dc6e791c4be..475a40414a7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2147,7 +2147,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) DBUG_ENTER("setup_conds"); thd->set_query_id=1; - thd->lex.current_select->cond_count= 0; + thd->lex->current_select->cond_count= 0; if (*conds) { thd->where="where clause"; @@ -2166,7 +2166,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) if (table->on_expr->fix_fields(thd, tables, &table->on_expr) || table->on_expr->check_cols(1)) DBUG_RETURN(1); - thd->lex.current_select->cond_count++; + thd->lex->current_select->cond_count++; /* If it's a normal join or a LEFT JOIN which can be optimized away @@ -2218,7 +2218,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) } } cond_and->used_tables_cache= t1->map | t2->map; - thd->lex.current_select->cond_count+=cond_and->list.elements; + thd->lex->current_select->cond_count+=cond_and->list.elements; if (!table->outer_join) // Not left join { if (!(*conds=and_conds(*conds, cond_and))) @@ -2426,7 +2426,7 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name, /* Kill delayed insert threads */ if (in_use->system_thread && ! in_use->killed) { - in_use->killed=1; + in_use->killed= THD::KILL_CONNECTION; pthread_mutex_lock(&in_use->mysys_var->mutex); if (in_use->mysys_var->current_cond) { |