Merge 10.4 into 10.5

1 files changed, 5 insertions, 2 deletions

diff --git a/sql/handler.h b/sql/handler.h
index ccd5f038b70..31b7bdcf998 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1040,7 +1040,7 @@ typedef bool (stat_print_fn)(THD *thd, const char *type, size_t type_len,
                              const char *file, size_t file_len,
                              const char *status, size_t status_len);
 enum ha_stat_type { HA_ENGINE_STATUS, HA_ENGINE_LOGS, HA_ENGINE_MUTEX };
-extern st_plugin_int *hton2plugin[MAX_HA];
+extern MYSQL_PLUGIN_IMPORT st_plugin_int *hton2plugin[MAX_HA];
 
 /* Transaction log maintains type definitions */
 enum log_status
@@ -1929,6 +1929,7 @@ typedef struct {
   time_t check_time;
   time_t update_time;
   ulonglong check_sum;
+  bool check_sum_null;
 } PARTITION_STATS;
 
 #define UNDEF_NODEGROUP 65535
@@ -2890,6 +2891,7 @@ public:
   time_t update_time;
   uint block_size;			/* index block size */
   ha_checksum checksum;
+  bool checksum_null;
 
   /*
     number of buffer bytes that native mrr implementation needs,
@@ -2901,7 +2903,7 @@ public:
     index_file_length(0), max_index_file_length(0), delete_length(0),
     auto_increment_value(0), records(0), deleted(0), mean_rec_length(0),
     create_time(0), check_time(0), update_time(0), block_size(0),
-    mrr_length_per_rec(0)
+    checksum(0), checksum_null(FALSE), mrr_length_per_rec(0)
   {}
 };
 
@@ -3934,6 +3936,7 @@ public:
   virtual uint max_supported_key_part_length() const { return 255; }
   virtual uint min_record_length(uint options) const { return 1; }
 
+  virtual int pre_calculate_checksum() { return 0; }
   virtual int calculate_checksum();
   virtual bool is_crashed() const  { return 0; }
   virtual bool auto_repair(int error) const { return 0; }