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: fix flashback table faild in uppercase database name (#17093) #17165

Merged
merged 5 commits into from
Jun 10, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 13, 2020

cherry-pick #17093 to release-3.0


Signed-off-by: crazycs520 crazycs520@gmail.com

What problem does this PR solve?

Fix below bugs:

drop database if exists Test2;
create database Test2;
use Test2;
create table t (a int);
drop table t;
flashback table t; -- should execute successfully.
(1105, u"Can't find dropped/truncated table: t in DDL history jobs")

drop table t;
drop database if exists Test3;
create database Test3;
use Test3;
create table t (a int);
drop table t;
drop database Test3;
use Test2;
flashback table t; -- should execute successfully.
(1049, u"Unknown database '(Schema ID 62)'")

What is changed and how it works?

No

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Manual test (add detailed scripts or steps below)

Side effects

  • No

Release note

  • Fix flashback table failed in some special cases.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented May 13, 2020

/run-all-tests

executor/ddl.go Outdated
@@ -422,6 +422,7 @@ func (e *DDLExec) getRecoverTableByTableName(s *ast.RecoverTableStmt, t *meta.Me
fmt.Sprintf("(Table ID %d)", job.TableID),
)
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@crazycs520
Please fix the conflicts.

Signed-off-by: crazycs520 <crazycs520@gmail.com>
Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

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

LGTM

@crazycs520
Copy link
Contributor

/run-all-tests

@crazycs520
Copy link
Contributor

/run-all-tests

Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@tangenta tangenta left a comment

Choose a reason for hiding this comment

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

LGTM

@bb7133 bb7133 modified the milestones: v3.0.14, v3.0.15 May 19, 2020
@bb7133 bb7133 modified the milestones: v3.0.15, 3.0.16, v3.0.16 Jun 6, 2020
@crazycs520
Copy link
Contributor

/run-all-tests

@zimulala zimulala merged commit 58ee9da into pingcap:release-3.0 Jun 10, 2020
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 type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants