summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-12 01:01:56 +0100
committerSergei Golubchik <serg@mariadb.org>2017-01-15 07:41:13 +0100
commit7e2f9d092dd1fb6b0fa1a8fdd5d1f3af68b56f45 (patch)
treeaa900a9230216644c43885fff04a92eac170b271 /mysql-test/r
parentab3388c3c44caecbec9974f54a2f30dd06237eee (diff)
downloadmariadb-git-7e2f9d092dd1fb6b0fa1a8fdd5d1f3af68b56f45.tar.gz
max_session_mem_used server variable
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/mysqld--help.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 93027e2bba4..340fa21f0df 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -457,6 +457,10 @@ The following options may be given as the first argument:
--max-seeks-for-key=#
Limit assumed max number of seeks when looking up rows
based on a key
+ --max-session-mem-used=#
+ Amount of memory a single user session is allowed to
+ allocate. This limits the value of the session variable
+ MEM_USED
--max-sort-length=# The number of bytes to use when sorting BLOB or TEXT
values (only the first max_sort_length bytes of each
value are used; the rest are ignored)
@@ -1266,6 +1270,7 @@ max-long-data-size 4194304
max-prepared-stmt-count 16382
max-relay-log-size 1073741824
max-seeks-for-key 18446744073709551615
+max-session-mem-used 9223372036854775807
max-sort-length 1024
max-sp-recursion-depth 0
max-statement-time 0