Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Doc] add Pinyin keywords (backport #47120) #47133

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2024

Add pinyin keywords

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #47120 done by [Mergify](https://mergify.com). Add pinyin keywords

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: DanRoscigno <[email protected]>
Signed-off-by: 絵空事スピリット <[email protected]>
Co-authored-by: 絵空事スピリット <[email protected]>
(cherry picked from commit 64cb37e)

# Conflicts:
#	docs/zh/sql-reference/sql-statements/data-definition/backup_restore/RECOVER.md
#	docs/zh/sql-reference/sql-statements/data-definition/backup_restore/backup_restore.mdx
Copy link
Contributor Author

mergify bot commented Jun 18, 2024

Cherry-pick of 64cb37e has failed:

On branch mergify/bp/branch-2.5/pr-47120
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 64cb37ed20.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/zh/cover_pages/query_acceleration.mdx
	modified:   docs/zh/sql-reference/sql-statements/data-definition/ALTER_VIEW.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/BACKUP.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/CANCEL_BACKUP.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/CANCEL_RESTORE.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/CREATE_REPOSITORY.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/CREATE_VIEW.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/DROP_REPOSITORY.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/DROP_VIEW.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/RESTORE.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/zh/sql-reference/sql-statements/data-definition/backup_restore/RECOVER.md
	deleted by us:   docs/zh/sql-reference/sql-statements/data-definition/backup_restore/backup_restore.mdx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jun 18, 2024
@mergify mergify bot mentioned this pull request Jun 18, 2024
24 tasks
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Jun 18, 2024
@mergify mergify bot closed this Jun 18, 2024
Copy link
Contributor Author

mergify bot commented Jun 18, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-47120 branch June 18, 2024 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge conflicts documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant