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.

Sign up for GitHub

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

Jump to bottom

ddl: fix warnings message when alter table nocache and cache again #33358

Merged
merged 2 commits into from
Mar 28, 2022
Merged

ddl: fix warnings message when alter table nocache and cache again #33358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b40fd5f
ddl: fix warnings message when alter table nocache and cache again
tiancaiamao Mar 23, 2022
7a04df8
Merge branch 'master' into issue-32692
ti-chi-bot Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ddl/db_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,17 @@ func TestCacheTableSizeLimit(t *testing.T) {
// Forbit the insert once the table size limit is detected.
tk.MustGetErrCode("insert into cache_t2 select * from tmp;", errno.ErrOptOnCacheTable)
}

func TestIssue32692(t *testing.T) {
store, clean := testkit.CreateMockStore(t)
defer clean()

tk := testkit.NewTestKit(t, store)
tk.MustExec("use test;")
tk.MustExec("create table cache_t2 (c1 int);")
tk.MustExec("alter table cache_t2 cache;")
tk.MustExec("alter table cache_t2 nocache;")
// Check no warning message here.
tk.MustExec("alter table cache_t2 cache;")
tk.MustQuery("show warnings").Check(testkit.Rows())
}
2 changes: 1 addition & 1 deletion ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6955,7 +6955,7 @@ func (d *ddl) AlterTableCache(ctx sessionctx.Context, ti ast.Ident) (err error)
// The operation shouldn't fail in most cases, and if it does, return the error directly.
// This DML and the following DDL is not atomic, that's not a problem.
_, err = ctx.(sqlexec.SQLExecutor).ExecuteInternal(context.Background(),
"insert ignore into mysql.table_cache_meta values (%?, 'NONE', 0, 0)", t.Meta().ID)
"replace into mysql.table_cache_meta values (%?, 'NONE', 0, 0)", t.Meta().ID)
if err != nil {
return errors.Trace(err)
}
Expand Down