Merge 10.4 into 10.5

2025-08-08 11:22:35 +03:00 · 2022-09-26 13:34:38 +03:00
parent 0792aff161 3c92050d1c
commit 6286a05d80
80 changed files with 2760 additions and 2483 deletions
--- a/sql/log.h
+++ b/sql/log.h
@@ -734,7 +734,7 @@ public:
  }
  void harvest_bytes_written(Atomic_counter<uint64> *counter)
  {
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
    char buf1[22],buf2[22];
 #endif
    DBUG_ENTER("harvest_bytes_written");