Merge branch '10.4' into 10.5

2022-08-04 12:16:35 +02:00 · 2022-08-04 12:16:35 +02:00 · ea12dafe65
commit ea12dafe65
parent 1e71ea806b 6adfce9c8d
2 changed files with 2 additions and 2 deletions
--- 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
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@ -1301,7 +1301,7 @@ public:

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