1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.3 into 10.4

In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
This commit is contained in:
Marko Mäkelä
2019-04-25 16:05:20 +03:00
88 changed files with 1762 additions and 342 deletions

View File

@ -2428,6 +2428,9 @@ public:
*/
bool create_tmp_table_for_derived;
/* The flag to force reading statistics from EITS tables */
bool force_read_stats;
bool save_prep_leaf_list;
/* container for handler's private per-connection data */