From c6406643cdba6f38d2c820169a36dbf4921bfeca Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Thu, 4 Aug 2022 10:01:24 +0200 Subject: Fix compile errors. --- sql/sql_select.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_select.h b/sql/sql_select.h index 9051b7fd2b8..ecfa4c6fd11 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1289,7 +1289,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[] */ -- cgit v1.2.1 From 992b510b2ff8877091d5c36b31d1882e8c4a233f Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Thu, 4 Aug 2022 10:01:24 +0200 Subject: Fix compile errors. --- sql/sql_select.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_select.h b/sql/sql_select.h index fe6a640003f..a953354abb0 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1265,7 +1265,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[] */ -- cgit v1.2.1 From 43c7f6a0f3d2d636fea0decfc9b5818e4a7c885a Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 4 Aug 2022 19:41:09 +1000 Subject: MDEV-18702: mysqldump: add variable 'max-statement-time' (mtr fix) Disable for embedded as mysqldump cannot connect to embedded server. --- mysql-test/main/mysqldump-timing.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1