--- include/varlen_sort.h.orig	2023-01-30 20:34:34.000000000 +0700
+++ include/varlen_sort.h	2023-02-25 15:15:11.238374000 +0700
@@ -184,7 +184,9 @@ template <>
 
 // Required for Iterator.
 template <>
-struct iterator_traits<varlen_iterator> : iterator_traits<varlen_element *> {};
+struct iterator_traits<varlen_iterator> : iterator_traits<varlen_element *> {
+  using reference = varlen_element;
+};
 
 }  // namespace std
 
--- storage/innobase/include/ddl0impl.h.orig	2023-01-30 20:34:34.000000000 +0700
+++ storage/innobase/include/ddl0impl.h	2023-02-25 15:17:06.382636000 +0700
@@ -118,14 +118,6 @@ struct Row {
 
 /** Physical row context. */
 struct Row {
-  /** Constructor. */
-  Row() = default;
-
-  Row(const Row &) = default;
-
-  /** Destructor. */
-  ~Row() = default;
-
   /** Build a row from a raw record.
   @param[in,out] ctx            DDL context.
   @param[in,out] index          Index the record belongs to.
--- unittest/gunit/mysys_my_rdtsc-t.cc.orig	2023-01-30 20:34:34.000000000 +0700
+++ unittest/gunit/mysys_my_rdtsc-t.cc	2023-02-25 15:23:43.264080000 +0700
@@ -113,7 +113,7 @@ TEST_F(RDTimeStampCounter, TestCycle) {
   ulonglong t1 = my_timer_cycles();
   ulonglong t2;
   int i;
-  int backward = 0;
+  int backward [[maybe_unused]] = 0;
   int nonzero = 0;
 
   for (i = 0; i < LOOP_COUNT; i++) {
