--- storage/tokudb/tokudb_memory.h	2020-08-07 14:57:38.000000000 +0200
+++ storage/tokudb/tokudb_memory.h	2020-09-19 16:38:23.211752400 +0200
@@ -42,8 +42,10 @@
 inline void* malloc(size_t s, myf flags) {
 #if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
     return ::my_malloc(0, s, flags);
-#else
+#elif MYSQL_VERSION_ID <= 100499
     return ::my_malloc(s, flags);
+#else
+    return ::my_malloc(PSI_NOT_INSTRUMENTED, s, flags);
 #endif
 }
 inline void* realloc(void* p, size_t s, myf flags) {
@@ -51,8 +53,10 @@
         return p;
 #if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
     return ::my_realloc(0, p, s, flags);
-#else
+#elif MYSQL_VERSION_ID <= 100499
     return ::my_realloc(p, s, flags | MY_ALLOW_ZERO_PTR);
+#else
+    return ::my_realloc(PSI_NOT_INSTRUMENTED, p, s, flags | MY_ALLOW_ZERO_PTR);
 #endif
 }
 inline void free(void* ptr) {
@@ -62,8 +66,10 @@
 inline char* strdup(const char* p, myf flags) {
 #if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
     return ::my_strdup(0, p, flags);
-#else
+#elif MYSQL_VERSION_ID <= 100499
     return ::my_strdup(p, flags);
+#else
+    return ::my_strdup(PSI_NOT_INSTRUMENTED, p, flags);
 #endif
 }
 inline void* multi_malloc(myf myFlags, ...) {
--- storage/tokudb/ha_tokudb_alter_56.cc	2020-08-07 14:57:38.000000000 +0200
+++ storage/tokudb/ha_tokudb_alter_56.cc	2020-09-19 17:24:47.206301215 +0200
@@ -58,6 +58,7 @@
         expand_fixed_update_needed(false),
         expand_blob_update_needed(false),
         optimize_needed(false),
+        changed_fields((PSI_memory_key) PSI_NOT_INSTRUMENTED),
         table_kc_info(NULL),
         altered_table_kc_info(NULL) {
     }
--- storage/tokudb/ha_tokudb.cc	2020-08-07 14:57:38.000000000 +0200
+++ storage/tokudb/ha_tokudb.cc	2020-09-19 17:23:00.408946179 +0200
@@ -6387,7 +6387,7 @@
             "created master %p",
             trx->all);
         trx->sp_level = trx->all;
-        trans_register_ha(thd, true, tokudb_hton);
+        trans_register_ha(thd, true, tokudb_hton, 0);
     }
     DBUG_PRINT("trans", ("starting transaction stmt"));
     if (trx->stmt) { 
@@ -6429,7 +6429,7 @@
         trx->sp_level,
         trx->stmt);
     reset_stmt_progress(&trx->stmt_progress);
-    trans_register_ha(thd, false, tokudb_hton);
+    trans_register_ha(thd, false, tokudb_hton, 0);
 cleanup:
     return error;
 }
@@ -6594,7 +6594,7 @@
         share->rows_from_locked_table = added_rows - deleted_rows;
     }
     transaction = trx->sub_sp_level;
-    trans_register_ha(thd, false, tokudb_hton);
+    trans_register_ha(thd, false, tokudb_hton, 0);
 cleanup:
     TOKUDB_HANDLER_DBUG_RETURN(error);
 }