1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin 2022-08-04 12:16:35 +02:00
commit ea12dafe65
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/mysqldump-timing.test
View File

@ -1,4 +1,4 @@
--source include/not_embedded.inc
--echo # --echo #
--echo # MDEV-18702 mysqldump should use max_statement_time=0 and/or allow setting one --echo # MDEV-18702 mysqldump should use max_statement_time=0 and/or allow setting one

2
sql/sql_select.h
View File

@ -1301,7 +1301,7 @@ public:
#ifndef DBUG_OFF #ifndef DBUG_OFF
void dbug_verify_sj_inner_tables(uint n_positions) const; void dbug_verify_sj_inner_tables(uint n_positions) const;
uint dbug_join_tab_array_size; int dbug_join_tab_array_size;
#endif #endif
/* We also maintain a stack of join optimization states in * join->positions[] */ /* We also maintain a stack of join optimization states in * join->positions[] */