From 82239a7a8284e1332a508dde3ac7715d5e82eda7 Mon Sep 17 00:00:00 2001 From: Shenghui Wu <793703860@qq.com> Date: Tue, 6 Jul 2021 10:31:28 +0800 Subject: [PATCH] This is an automated cherry-pick of #6409 Signed-off-by: ti-chi-bot --- system-variables.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system-variables.md b/system-variables.md index c8ef8256ef0c..07eda135b50d 100644 --- a/system-variables.md +++ b/system-variables.md @@ -825,8 +825,13 @@ v5.0 后，用户仍可以单独修改以上系统变量（会有废弃警告） ### `tidb_memory_usage_alarm_ratio` +<<<<<<< HEAD - 作用域：SESSION - 默认值：0.8 +======= +- 作用域：`INSTANCE` +- 默认值：`0.8` +>>>>>>> 47de91471 (Change tidb_memory_usage_alarm_ratio scope to instance (#6409)) - TiDB 内存使用占总内存的比例超过一定阈值时会报警。该功能的详细介绍和使用方法可以参考 [`memory-usage-alarm-ratio`](/tidb-configuration-file.md#memory-usage-alarm-ratio-从-v409-版本开始引入)。 - 该变量的初始值可通过 [`memory-usage-alarm-ratio`](/tidb-configuration-file.md#memory-usage-alarm-ratio-从-v409-版本开始引入) 进行配置。