From bf58ec77a1adaa653a0b044b950cf420f8c19de9 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Mon, 25 Nov 2019 15:44:46 +0300 Subject: MDEV-18727 cleanup --- sql/sql_delete.cc | 14 -------------- sql/sql_update.cc | 6 ------ 2 files changed, 20 deletions(-) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 4245c843968..78bccd7a506 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -917,20 +917,6 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(true); } -/* 10.4: - if (table_list->has_period()) - { - if (table_list->is_view_or_derived()) - { - my_error(ER_IT_IS_A_VIEW, MYF(0), table_list->table_name.str); - DBUG_RETURN(true); - } - - if (select_lex->period_setup_conds(thd, table_list)) - DBUG_RETURN(true); - } -*/ - DBUG_ASSERT(table_list->table); // conds could be cached from previous SP call DBUG_ASSERT(!table_list->vers_conditions.is_set() || diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 39d28bfbe50..1e5440ee4fe 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1261,12 +1261,6 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, thd->lex->allow_sum_func.clear_all(); -/* 10.4: - if (table_list->has_period() && - select_lex->period_setup_conds(thd, table_list)) - DBUG_RETURN(true); -*/ - DBUG_ASSERT(table_list->table); // conds could be cached from previous SP call DBUG_ASSERT(!table_list->vers_conditions.is_set() || -- cgit v1.2.1