master: add v8.5.7 support info for performance_schema_session_connect_attrs_size#23172
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot
added
do-not-merge/hold
|
@ti-chi-bot This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. |
ti-chi-bot
Bot
added
size/L
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates several documentation files to reflect support for logging session connection attributes to the slow query log in v8.5.7. However, the changes introduce unresolved Git merge conflicts across all modified files, including information-schema-slow-query.md, performance-schema-session-connect-attrs.md, system-variable-reference.md, and system-variables.md. The reviewer feedback correctly identifies these conflicts and requests their resolution by keeping the v8.5.7 version and removing the v9.0.0 version and conflict markers.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| <<<<<<< HEAD | ||
| The `Session_connect_attrs` column stores session connection attributes in JSON format parsed from the slow log. TiDB controls the maximum payload size written to this field using [`performance_schema_session_connect_attrs_size`](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v900). | ||
| ======= | ||
| The `Session_connect_attrs` column stores session connection attributes in JSON format parsed from the slow log. TiDB controls the maximum payload size written to this field using [`performance_schema_session_connect_attrs_size`](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v857). | ||
| >>>>>>> 68bb5e64f0 (v8.5.7: support logging session connect attrs to slow query log (#22547) (#22775)) |
There was a problem hiding this comment.
There is an unresolved merge conflict here. Please resolve it by keeping the v8.5.7 version and removing the v9.0.0 version and conflict markers:
The Session_connect_attrs column stores session connection attributes in JSON format parsed from the slow log. TiDB controls the maximum payload size written to this field using performance_schema_session_connect_attrs_size.
| <<<<<<< HEAD | ||
| TiDB uses the [`performance_schema_session_connect_attrs_size`](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v900) global system variable to control the maximum total size of connection attributes per session. | ||
| ======= | ||
| TiDB uses the [`performance_schema_session_connect_attrs_size`](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v857) global system variable to control the maximum total size of connection attributes per session. | ||
| >>>>>>> 68bb5e64f0 (v8.5.7: support logging session connect attrs to slow query log (#22547) (#22775)) |
There was a problem hiding this comment.
There is an unresolved merge conflict here. Please resolve it by keeping the v8.5.7 version and removing the v9.0.0 version and conflict markers:
TiDB uses the performance_schema_session_connect_attrs_size global system variable to control the maximum total size of connection attributes per session.
| <<<<<<< HEAD | ||
| - [System Variables](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v900) | ||
| ======= | ||
| - [System Variables](/system-variables.md#performance_schema_session_connect_attrs_size-new-in-v857) | ||
| >>>>>>> 68bb5e64f0 (v8.5.7: support logging session connect attrs to slow query log (#22547) (#22775)) |
There was a problem hiding this comment.
There is an unresolved merge conflict here. Please resolve it by keeping the v8.5.7 version and removing the v9.0.0 version and conflict markers:
| <<<<<<< HEAD | ||
| ### performance_schema_session_connect_attrs_size <span class="version-mark">New in v9.0.0</span> | ||
| ======= | ||
| ### performance_schema_session_connect_attrs_size <span class="version-mark">New in v8.5.7</span> | ||
| >>>>>>> 68bb5e64f0 (v8.5.7: support logging session connect attrs to slow query log (#22547) (#22775)) |
There was a problem hiding this comment.
There is an unresolved merge conflict here. Please resolve it by keeping the v8.5.7 version and removing the v9.0.0 version and conflict markers.
| <<<<<<< HEAD | |
| ### performance_schema_session_connect_attrs_size <span class="version-mark">New in v9.0.0</span> | |
| ======= | |
| ### performance_schema_session_connect_attrs_size <span class="version-mark">New in v8.5.7</span> | |
| >>>>>>> 68bb5e64f0 (v8.5.7: support logging session connect attrs to slow query log (#22547) (#22775)) | |
| ### performance_schema_session_connect_attrs_size <span class="version-mark">New in v8.5.7</span> |
qiancai
changed the title
|
/approve |
ti-chi-bot
Bot
added
size/XS
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: qiancai The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
qiancai
removed
the
do-not-merge/hold
2 participants
This is an automated cherry-pick of #22775
This is an automated cherry-pick of #22547
First-time contributors' checklist
What is changed, added or deleted? (Required)
This PR updates docs according to pingcap/tidb#66617:
Session_connect_attrs(json) to the schema examples ofINFORMATION_SCHEMA.SLOW_QUERYandINFORMATION_SCHEMA.CLUSTER_SLOW_QUERY.performance_schema_session_connect_attrs_size(default/range/-1behavior/truncation/1 MiB hard limit note).Performance_schema_session_connect_attrs_longest_seenPerformance_schema_session_connect_attrs_lostSESSION_CONNECT_ATTRSdoc with size limit and truncation behavior.Which TiDB version(s) do your changes apply to? (Required)
Tips for choosing the affected version(s):
By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.
For details, see tips for choosing the affected versions.
What is the related PR or file link(s)?
Do your changes match any of the following descriptions?