diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-18 11:33:07 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-18 12:17:11 +1100 |
| commit | 065f995e6d7778ef69a8a0a4829b79244fa75ba4 (patch) | |
| tree | 4b481bbe125ccbd14c1a740876b1309b2df9dcea /sql/mysqld.cc | |
| parent | ee80c19633dd5d4e781b3e675d2ece52a5b0f9ff (diff) | |
| parent | 06e3bc4390ee286fd20b34526510768f1b32ed7f (diff) | |
| download | mariadb-git-065f995e6d7778ef69a8a0a4829b79244fa75ba4.tar.gz | |
Merge branch 10.5 into 10.6
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b6748170942..c3f745b4aae 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3640,13 +3640,18 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) /* Ensure we don't get called here again */ char buf[50], *buf2; thd->set_killed(KILL_QUERY); - my_snprintf(buf, sizeof(buf), "--max-thread-mem-used=%llu", + my_snprintf(buf, sizeof(buf), "--max-session-mem-used=%llu", thd->variables.max_mem_used); if ((buf2= (char*) thd->alloc(256))) { my_snprintf(buf2, 256, ER_THD(thd, ER_OPTION_PREVENTS_STATEMENT), buf); thd->set_killed(KILL_QUERY, ER_OPTION_PREVENTS_STATEMENT, buf2); } + else + { + thd->set_killed(KILL_QUERY, ER_OPTION_PREVENTS_STATEMENT, + "--max-session-mem-used"); + } } DBUG_ASSERT((longlong) thd->status_var.local_memory_used >= 0 || !debug_assert_on_not_freed_memory); |