diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
commit | e6bdf77e4be48750c4808a09af197ed91fd69a61 (patch) | |
tree | 2ca921747b9ae7b01835efe9609799b27efb1387 /sql/sql_class.h | |
parent | 1599825ffc2c942f8b63274a9556b425229375c7 (diff) | |
parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
download | mariadb-git-e6bdf77e4be48750c4808a09af197ed91fd69a61.tar.gz |
Merge 10.3 into 10.4
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 9e51f45126a..da21b9cb108 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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 */ |