From 159dc969ddd2ced669acbb669bae5fc8a4383b92 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 22 Jul 2016 15:36:31 +0200
Subject: [PATCH] cleanup: redundant variable

---
 sql/sql_class.cc | 4 ++--
 sql/sql_class.h  | 2 +-
 sql/table.cc     | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 4ace2be3e28..d29dc0eff14 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -870,7 +870,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
    is_fatal_sub_stmt_error(false),
    rand_used(0),
    time_zone_used(0),
-   in_lock_tables(0), in_stored_expression(0),
+   in_lock_tables(0),
    bootstrap(0),
    derived_tables_processing(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,
 			       from, from_length, from_cs, &errors);
   to->str[to->length]= 0;                       // Safety
-  if (errors && in_stored_expression)
+  if (errors && lex->parse_vcol_expr)
   {
     my_error(ER_BAD_DATA, MYF(0),
              ErrConvString(from, from_length, from_cs).ptr(),
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 55c0948d46e..6e71adf023a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2858,7 +2858,7 @@ public:
   bool       query_start_sec_part_used;
   /* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
   bool       substitute_null_with_insert_id;
-  bool	     in_lock_tables, in_stored_expression;
+  bool	     in_lock_tables;
   bool       bootstrap, cleanup_done, free_connection_done;
 
   /**  is set if some thread specific value(s) used in a statement. */
diff --git a/sql/table.cc b/sql/table.cc
index 9be2ae31215..ca6a5a1b5a6 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2512,11 +2512,8 @@ static bool fix_vcol_expr(THD *thd, Virtual_column_info *vcol)
   const char *save_where= thd->where;
   thd->where= "virtual column function";
 
-  thd->in_stored_expression= 1;
-
   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->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,
                         table->s->table_charset);
   }
-  thd->in_stored_expression= 1;
   error= parse_sql(thd, &parser_state, NULL);
-  thd->in_stored_expression= 0;
   if (error)
     goto err;