[Commits] dafe41edead: Removing of dead code.

Oleksandr Byelkin sanja at mariadb.com
Mon May 20 10:38:08 EEST 2019


revision-id: dafe41edead86785908f38093833f84994d312b9 (mariadb-10.4.4-114-gdafe41edead)
parent(s): 1d00f81921ecddef3663deaa3481138cdb0c660e
author: Oleksandr Byelkin
committer: Oleksandr Byelkin
timestamp: 2019-05-20 09:38:08 +0200
message:

Removing of dead code.

---
 sql/sql_lex.cc | 32 --------------------------------
 sql/sql_lex.h  |  2 --
 2 files changed, 34 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 573c609de79..5550306877a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -8812,38 +8812,6 @@ bool LEX::last_field_generated_always_as_row_end()
 }
 
 
-bool LEX::tvc_finalize()
-{
-  mysql_init_select(this);
-  if (unlikely(!(current_select->tvc=
-               new (thd->mem_root)
-               table_value_constr(many_values,
-                                  current_select,
-                                  current_select->options))))
-    return true;
-  many_values.empty();
-  if (!current_select->master_unit()->fake_select_lex)
-    current_select->master_unit()->add_fake_select_lex(thd);
-  return false;
-}
-
-
-bool LEX::tvc_finalize_derived()
-{
-  derived_tables|= DERIVED_SUBQUERY;
-  if (unlikely(!expr_allows_subselect))
-  {
-    thd->parse_error();
-    return true;
-  }
-  if (current_select->get_linkage() == GLOBAL_OPTIONS_TYPE ||
-      unlikely(mysql_new_select(this, 1, NULL)))
-    return true;
-  current_select->set_linkage(DERIVED_TABLE_TYPE);
-  return tvc_finalize();
-}
-
-
 void st_select_lex_unit::reset_distinct()
 {
   union_distinct= NULL;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 76e8b86d12d..c53fa1b1fd4 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -4396,8 +4396,6 @@ struct LEX: public Query_tables_list
     many_values.empty();
     insert_list= 0;
   }
-  bool tvc_finalize();
-  bool tvc_finalize_derived();
 
   bool make_select_in_brackets(SELECT_LEX* dummy_select,
                                SELECT_LEX *nselect, bool automatic);


More information about the commits mailing list