Merge branch '10.4' into 10.5

ea12dafe · Oleksandr Byelkin · 1e71ea80 · 6adfce9c · ea12dafe · ea12dafe
Commit ea12dafe authored Aug 04, 2022 by Oleksandr Byelkin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/main/mysqldump-timing.test mysql-test/main/mysqldump-timing.test +1 -1

sql/sql_select.h sql/sql_select.h +1 -1

No files found.
--- a/mysql-test/main/mysqldump-timing.test
+++ b/mysql-test/main/mysqldump-timing.test
-
+--source include/not_embedded.inc

 --echo #
 --echo # MDEV-18702 mysqldump should use max_statement_time=0 and/or allow setting one

--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1301,7 +1301,7 @@ class JOIN :public Sql_alloc

 #ifndef DBUG_OFF
  void dbug_verify_sj_inner_tables(uint n_positions) const;
-  uint dbug_join_tab_array_size;
+  int dbug_join_tab_array_size;
 #endif

  /* We also maintain a stack of join optimization states in * join->positions[] */