diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 08:37:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 08:37:38 +0200 |
| commit | e7c6f83bce0ef08da74d4b9b3959a15f2648cacd (patch) | |
| tree | 5a5e6742773296e0f61feb71aea0baf8a6b799fe /sql/sql_class.h | |
| parent | a1315a650a69745bac7166cfe1423215dfaac6e1 (diff) | |
| parent | 03497129371fe2c16d847b7e83a5eeecab9c34a2 (diff) | |
| download | mariadb-git-bb-10.2-mdev-11623.tar.gz | |
Merge 10.1 to 10.2.bb-10.2-mdev-11623
Most notably, this includes MDEV-11623, which includes a fix and
an upgrade procedure for the InnoDB file format incompatibility
that is present in MariaDB Server 10.1.0 through 10.1.20.
In other words, this merge should address
MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3a7454e0a89..b6dafd939bc 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -546,6 +546,7 @@ typedef struct system_variables ulonglong sortbuff_size; ulonglong group_concat_max_len; ulonglong default_regex_flags; + ulonglong max_mem_used; /** Place holders to store Multi-source variables in sys_var.cc during |