From dd5679c374050dd17b342e9886e8272d4638f460 Mon Sep 17 00:00:00 2001
From: Qiannan Lyu <lvqiannan@gmail.com>
Date: Tue, 19 May 2020 22:52:58 +1200
Subject: [PATCH 1/3] Update documentation

Signed-off-by: Qiannan Lyu <lvqiannan@gmail.com>
---
 tidb-configuration-file.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md
index 9e62cd3b22163..8dfba999b8125 100644
--- a/tidb-configuration-file.md
+++ b/tidb-configuration-file.md
@@ -33,6 +33,7 @@ The TiDB configuration file supports more options than command-line parameters.
 
 + Specifies the temporary storage path for some operators when a single SQL statement exceeds the memory quota specified by `mem-quota-query`.
 + Default value: `<TMPDIR>/tidb/tmp-storage`
++ Default value: `<OS TMPDIR>/<OS User ID>_tidb/MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=/tmp-storage`. The `MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=` is the `Base64` encoding result of `<host>:<port>/<statusHost>:<statusPort>`.
 + It only takes effect when `oom-use-tmp-storage` is `true`.
 
 ### `tmp-storage-quota`

From 610d0ce4ff756c250fedfe93780ef8d02a660d1a Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Tue, 26 May 2020 10:31:20 +0800
Subject: [PATCH 2/3] Update tidb-configuration-file.md

---
 tidb-configuration-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md
index 8dfba999b8125..3317bdee837bb 100644
--- a/tidb-configuration-file.md
+++ b/tidb-configuration-file.md
@@ -33,7 +33,7 @@ The TiDB configuration file supports more options than command-line parameters.
 
 + Specifies the temporary storage path for some operators when a single SQL statement exceeds the memory quota specified by `mem-quota-query`.
 + Default value: `<TMPDIR>/tidb/tmp-storage`
-+ Default value: `<OS TMPDIR>/<OS User ID>_tidb/MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=/tmp-storage`. The `MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=` is the `Base64` encoding result of `<host>:<port>/<statusHost>:<statusPort>`.
++ Default value: `<OS TMPDIR>/<OS User ID>_tidb/MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=/tmp-storage`. `MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=` is the `Base64` encoding result of `<host>:<port>/<statusHost>:<statusPort>`.
 + It only takes effect when `oom-use-tmp-storage` is `true`.
 
 ### `tmp-storage-quota`

From 7d2092798457bdf5a9b69e7ab72c012d1fb6a19e Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Thu, 28 May 2020 11:31:33 +0800
Subject: [PATCH 3/3] Update tidb-configuration-file.md

---
 tidb-configuration-file.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md
index 3317bdee837bb..5feaf7b5acc6f 100644
--- a/tidb-configuration-file.md
+++ b/tidb-configuration-file.md
@@ -32,9 +32,8 @@ The TiDB configuration file supports more options than command-line parameters.
 ### `tmp-storage-path`
 
 + Specifies the temporary storage path for some operators when a single SQL statement exceeds the memory quota specified by `mem-quota-query`.
-+ Default value: `<TMPDIR>/tidb/tmp-storage`
-+ Default value: `<OS TMPDIR>/<OS User ID>_tidb/MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=/tmp-storage`. `MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=` is the `Base64` encoding result of `<host>:<port>/<statusHost>:<statusPort>`.
-+ It only takes effect when `oom-use-tmp-storage` is `true`.
++ Default value: `<temporary directory of OS>/<OS user ID>_tidb/MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=/tmp-storage`. `MC4wLjAuMDo0MDAwLzAuMC4wLjA6MTAwODA=` is the `Base64` encoding result of `<host>:<port>/<statusHost>:<statusPort>`.
++ This configuration takes effect only when `oom-use-tmp-storage` is `true`.
 
 ### `tmp-storage-quota`