diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-26 16:57:28 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-26 16:57:28 +0100 |
| commit | 305ae953db50075aa735a444464ef7086e7ad6fb (patch) | |
| tree | 69c9a1e2b0fcef40af3f706d55800f0e7f541dd8 /sql/sql_class.h | |
| parent | 7da4229f2ef2bdf24b6196991d8e474fa42c1811 (diff) | |
| parent | 8e6cfaf736de92429e5fcc3977529ec2311442c5 (diff) | |
| download | mariadb-git-305ae953db50075aa735a444464ef7086e7ad6fb.tar.gz | |
merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 53e0d83f37a..62c28a1d5c5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -467,11 +467,13 @@ typedef struct system_variables ulonglong join_buff_space_limit; ulonglong log_slow_filter; ulonglong log_slow_verbosity; + ulonglong bulk_insert_buff_size; + ulonglong join_buff_size; + ulonglong sortbuff_size; + ulonglong group_concat_max_len; ha_rows select_limit; ha_rows max_join_size; ulong auto_increment_increment, auto_increment_offset; - ulong bulk_insert_buff_size; - ulong join_buff_size; ulong lock_wait_timeout; ulong join_cache_level; ulong max_allowed_packet; @@ -496,7 +498,6 @@ typedef struct system_variables ulong read_rnd_buff_size; ulong mrr_buff_size; ulong div_precincrement; - ulong sortbuff_size; /* Total size of all buffers used by the subselect_rowid_merge_engine. */ ulong rowid_merge_buff_size; ulong max_sp_recursion_depth; @@ -508,7 +509,6 @@ typedef struct system_variables ulong trans_alloc_block_size; ulong trans_prealloc_size; ulong log_warnings; - ulong group_concat_max_len; /* Flags for slow log filtering */ ulong log_slow_rate_limit; ulong binlog_format; ///< binlog format for this thd (see enum_binlog_format) @@ -536,6 +536,7 @@ typedef struct system_variables my_bool old_alter_table; my_bool old_passwords; my_bool big_tables; + my_bool query_cache_strip_comments; plugin_ref table_plugin; |