diff options
author | Igor Babaev <igor@askmonty.org> | 2010-12-10 23:23:34 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2010-12-10 23:23:34 -0800 |
commit | 7f52af655a04c4fecfe32bede79bd65cac0e043d (patch) | |
tree | 071fe4a63bdce21ee8a0a6cfe5e7aa4b3b26f354 /sql/sql_class.h | |
parent | eb70e64ceaa7aec6a35580643a3e5fc01b6a0630 (diff) | |
parent | 4e05898f539f299bbb12c49834502c1e471f2fc9 (diff) | |
download | mariadb-git-7f52af655a04c4fecfe32bede79bd65cac0e043d.tar.gz |
Merge.
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 bd6402053f3..7f3b0cbfb03 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -380,6 +380,7 @@ struct system_variables ulonglong max_heap_table_size; ulonglong tmp_table_size; ulonglong long_query_time; + ulonglong join_buff_space_limit; ha_rows select_limit; ha_rows max_join_size; ulong auto_increment_increment, auto_increment_offset; |