Merge 10.6 into 10.7

MariaDB · Mar 30, 2022 · a4d7537 · a4d7537
2 parents 2885fb0 + 0a573e7
commit a4d7537
Show file tree

Hide file tree

Showing 122 changed files with 3,597 additions and 716 deletions.
diff --git a/CREDITS b/CREDITS
@@ -4,9 +4,11 @@ organization registered in the USA.
 The current main sponsors of the MariaDB Foundation are:
 
 Alibaba Cloud                   https://www.alibabacloud.com/ (2017)
+Intel				https://www.intel.com (2022)
 MariaDB Corporation		https://www.mariadb.com  (2013)
 Microsoft			https://microsoft.com/ (2017)
 ServiceNow			https://servicenow.com (2019)
+SIT				https://sit.org (2022)
 Tencent Cloud			https://cloud.tencent.com (2017)
 Development Bank of Singapore   https://dbs.com (2016)
 IBM				https://www.ibm.com (2017)

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -2565,6 +2565,7 @@ static Exit_status handle_event_raw_mode(PRINT_EVENT_INFO *print_event_info,
     error("Could not write into log file '%s'", out_file_name);
     DBUG_RETURN(ERROR_STOP);
   }
+  fflush(result_file);
 
   DBUG_RETURN(OK_CONTINUE);
 }