diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-04 12:16:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-04 12:16:35 +0200 |
| commit | ea12dafe6543977bd98c61ffab8cc317b4f0b55b (patch) | |
| tree | 7c9f9cb65f97f0c18e3cabea689c03c263bbd64f | |
| parent | 1e71ea806b3b34c53babaea1965d8a67f6c631e2 (diff) | |
| parent | 6adfce9c8d2a63a259dd0504600271498dcda228 (diff) | |
| download | mariadb-git-ea12dafe6543977bd98c61ffab8cc317b4f0b55b.tar.gz | |
Merge branch '10.4' into 10.5
| -rw-r--r-- | mysql-test/main/mysqldump-timing.test | 2 | ||||
| -rw-r--r-- | sql/sql_select.h | 2 |
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[] */ |