diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-06 22:35:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-06 22:35:45 +0300 |
| commit | 2f4c391958b70ab4be622eb7010d7029363e9529 (patch) | |
| tree | 1aada0415af36291bce1e47ec0a092c9f27b5a37 /sql/sql_class.h | |
| parent | 3bfafd133f9cb9de143ac051de9ed72a67bbc2d9 (diff) | |
| parent | a0631e72210931182e950734b73c7a090c637261 (diff) | |
| download | mariadb-git-2f4c391958b70ab4be622eb7010d7029363e9529.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e2aed01ef3b..00a5c41f708 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -581,17 +581,6 @@ typedef struct system_variables ha_rows max_join_size; ha_rows expensive_subquery_limit; ulong auto_increment_increment, auto_increment_offset; -#ifdef WITH_WSREP - /* - Variables with stored values of the auto_increment_increment - and auto_increment_offset options that are will be needed when - wsrep_auto_increment_control will be set to 'OFF', because the - setting it to 'ON' leads to overwriting of the original values - (which are set by the user) by calculated values (which are - based on the cluster's size): - */ - ulong saved_auto_increment_increment, saved_auto_increment_offset; -#endif /* WITH_WSREP */ uint eq_range_index_dive_limit; ulong column_compression_zlib_strategy; ulong lock_wait_timeout; |