Merge 10.4 into 10.5

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/table.h b/sql/table.h
index 5391177f625..acaa8bcdafe 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1923,6 +1923,10 @@ struct vers_select_conds_t
   {
     return orig_type != SYSTEM_TIME_UNSPECIFIED;
   }
+  bool need_setup() const
+  {
+    return type != SYSTEM_TIME_UNSPECIFIED && type != SYSTEM_TIME_ALL;
+  }
   bool eq(const vers_select_conds_t &conds) const;
 };
 
@@ -3138,7 +3142,7 @@ public:
 
      @param[in] timestamp
      @param[in] true if we search for a lesser timestamp, false if greater
-     @retval true if exists, false it not exists or an error occured
+     @retval true if exists, false it not exists or an error occurred
    */
   bool query(MYSQL_TIME &commit_time, bool backwards);
   /**