Merge 10.4 into 10.5

1 files changed, 7 insertions, 6 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 8dd85d3de24..1567df7d537 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1765,6 +1765,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
     {
       table= best_table;
       table->query_id= thd->query_id;
+      table->init(thd, table_list);
       DBUG_PRINT("info",("Using locked table"));
 #ifdef WITH_PARTITION_STORAGE_ENGINE
       part_names_error= set_partitions_as_used(table_list, table);
@@ -2086,12 +2087,13 @@ retry_share:
   }
 
   table->mdl_ticket= mdl_ticket;
+  table->reginfo.lock_type=TL_READ;		/* Assume read */
+
+  table->init(thd, table_list);
 
   table->next= thd->open_tables;		/* Link into simple list */
   thd->set_open_tables(table);
 
-  table->reginfo.lock_type=TL_READ;		/* Assume read */
-
  reset:
   /*
     Check that there is no reference to a condition from an earlier query
@@ -2123,16 +2125,15 @@ retry_share:
     my_error(ER_NOT_SEQUENCE, MYF(0), table_list->db.str, table_list->alias.str);
     DBUG_RETURN(true);
   }
-  table->init(thd, table_list);
-  DBUG_ASSERT(thd->locked_tables_mode || table->file->row_logging == 0);
 
-  DBUG_RETURN(FALSE);
+  DBUG_ASSERT(thd->locked_tables_mode || table->file->row_logging == 0);
+  DBUG_RETURN(false);
 
 err_lock:
   tdc_release_share(share);
 
   DBUG_PRINT("exit", ("failed"));
-  DBUG_RETURN(TRUE);
+  DBUG_RETURN(true);
 }