summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-02 15:15:53 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-02 15:15:53 +0200
commit1110beccd4505dd563c134623b43afcf3f205f54 (patch)
tree7035fc7d8a4507ea6c7c3d0f74986d4168d1012e /sql/sql_class.h
parent8a495d7f90f64566d083d9ccd04cd95023a40931 (diff)
parentb76e5c66107d75d0161d8f8ab3cf05fc360c831e (diff)
downloadmariadb-git-1110beccd4505dd563c134623b43afcf3f205f54.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 4532c69e8e1..50b746fe514 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -815,6 +815,7 @@ typedef struct system_variables
uint column_compression_threshold;
uint column_compression_zlib_level;
uint in_subquery_conversion_threshold;
+ ulong optimizer_max_sel_arg_weight;
ulonglong max_rowid_filter_size;
vers_asof_timestamp_t vers_asof_timestamp;