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

executor,table: fix 'show create table' for the temporary table #24857

Merged
merged 8 commits into from
May 25, 2021

Conversation

tiancaiamao
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #24788 #24752

Problem Summary:

What is changed and how it works?

What's Changed:

Support show create table statement for the temporary table.

How it Works:

  • Add GLOBAL TEMPORARY ... ON COMMIT DELETE ROWS to the result
  • Avoid nil allocator for the temporary table in the show create table statement.

Check List

Tests

  • Unit test

Release note

  • No release note

@tiancaiamao tiancaiamao requested a review from a team as a code owner May 24, 2021 06:40
@tiancaiamao tiancaiamao requested review from wshwsh12 and removed request for a team May 24, 2021 06:40
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 24, 2021
@tiancaiamao tiancaiamao mentioned this pull request May 24, 2021
89 tasks
@github-actions github-actions bot added the sig/execution SIG execution label May 24, 2021
table/tables/tables.go Outdated Show resolved Hide resolved
@tiancaiamao tiancaiamao requested review from djshow832 and removed request for wshwsh12 May 25, 2021 09:29
@tiancaiamao
Copy link
Contributor Author

PTAL @djshow832 @wjhuang2016

@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label May 25, 2021
ddl/ddl_api.go Outdated
@@ -2225,7 +2225,7 @@ func handleTableOptions(options []*ast.TableOption, tbInfo *model.TableInfo) err
// We don't handle charset and collate here since they're handled in `getCharsetAndCollateInTableOption`.
case ast.TableOptionEngine:
if tbInfo.TempTableType != model.TempTableNone {
if op.StrValue != "" && !strings.EqualFold(op.StrValue, "memory") {
if op.StrValue != "" && !strings.EqualFold(op.StrValue, "memory") && !strings.EqualFold(op.StrValue, "innodb") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't support innodb.

@wjhuang2016
Copy link
Member

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 25, 2021
@djshow832
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • djshow832
  • wjhuang2016

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 25, 2021
@djshow832
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: b3b96e2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 25, 2021
@ti-chi-bot
Copy link
Member

@tiancaiamao: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions 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.

@tiancaiamao
Copy link
Contributor Author

/merge

@ti-chi-bot ti-chi-bot merged commit ced5615 into pingcap:master May 25, 2021
@tiancaiamao tiancaiamao deleted the show-create-table branch May 25, 2021 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SHOW CREATE TABLE nil pointer dereference for temporary table
4 participants