database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: redundant variable

Browse Source
This commit is contained in:
Sergei Golubchik
2016-07-22 15:36:31 +02:00
parent 39537435cb
commit 159dc969dd
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -870,7 +870,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
is_fatal_sub_stmt_error(false), is_fatal_sub_stmt_error(false),
rand_used(0), rand_used(0),
time_zone_used(0), time_zone_used(0),
in_lock_tables(0), in_stored_expression(0), in_lock_tables(0),
bootstrap(0), bootstrap(0),
derived_tables_processing(FALSE), derived_tables_processing(FALSE),
waiting_on_group_commit(FALSE), has_waiter(FALSE), waiting_on_group_commit(FALSE), has_waiter(FALSE),
@ -2338,7 +2338,7 @@ bool THD::convert_string(LEX_STRING *to, CHARSET_INFO *to_cs,
to->length= copy_and_convert((char*) to->str, new_length, to_cs, to->length= copy_and_convert((char*) to->str, new_length, to_cs,
from, from_length, from_cs, &errors); from, from_length, from_cs, &errors);
to->str[to->length]= 0; // Safety to->str[to->length]= 0; // Safety
if (errors && in_stored_expression) if (errors && lex->parse_vcol_expr)
{ {
my_error(ER_BAD_DATA, MYF(0), my_error(ER_BAD_DATA, MYF(0),
ErrConvString(from, from_length, from_cs).ptr(), ErrConvString(from, from_length, from_cs).ptr(),

2
sql/sql_class.h
View File

@ -2858,7 +2858,7 @@ public:
bool query_start_sec_part_used; bool query_start_sec_part_used;
/* for IS NULL => = last_insert_id() fix in remove_eq_conds() */ /* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
bool substitute_null_with_insert_id; bool substitute_null_with_insert_id;
bool in_lock_tables, in_stored_expression; bool in_lock_tables;
bool bootstrap, cleanup_done, free_connection_done; bool bootstrap, cleanup_done, free_connection_done;
/** is set if some thread specific value(s) used in a statement. */ /** is set if some thread specific value(s) used in a statement. */

5
sql/table.cc
View File

@ -2512,11 +2512,8 @@ static bool fix_vcol_expr(THD *thd, Virtual_column_info *vcol)
const char *save_where= thd->where; const char *save_where= thd->where;
thd->where= "virtual column function"; thd->where= "virtual column function";
thd->in_stored_expression= 1;
int error= vcol->expr_item->fix_fields(thd, &vcol->expr_item); int error= vcol->expr_item->fix_fields(thd, &vcol->expr_item);
thd->in_stored_expression= 0;
thd->mark_used_columns= save_mark_used_columns; thd->mark_used_columns= save_mark_used_columns;
thd->where= save_where; thd->where= save_where;
@ -2753,9 +2750,7 @@ Virtual_column_info *unpack_vcol_info_from_frm(THD *thd,
thd->update_charset(&my_charset_utf8mb4_general_ci, thd->update_charset(&my_charset_utf8mb4_general_ci,
table->s->table_charset); table->s->table_charset);
} }
thd->in_stored_expression= 1;
error= parse_sql(thd, &parser_state, NULL); error= parse_sql(thd, &parser_state, NULL);
thd->in_stored_expression= 0;
if (error) if (error)
goto err; goto err;