summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/main/mysqldump-timing.test2
-rw-r--r--sql/sql_select.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysqldump-timing.test b/mysql-test/main/mysqldump-timing.test
index 25921fdd0cd..07305b73a72 100644
--- 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
index 4ada816692e..32013f4f295 100644
--- 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[] */