Merge branch '10.4' into 10.5

MariaDB · Aug 4, 2022 · ea12daf · ea12daf
2 parents 1e71ea8 + 6adfce9
commit ea12daf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mysql-test/main/mysqldump-timing.test b/mysql-test/main/mysqldump-timing.test
@@ -1,4 +1,4 @@
-
+--source include/not_embedded.inc
 
 --echo #
 --echo # MDEV-18702 mysqldump should use max_statement_time=0 and/or allow setting one

diff --git 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[] */