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: Add warning for resetting specified AUTO_INCREMENT value #32078

Merged
merged 4 commits into from
Mar 31, 2022
Merged

ddl: Add warning for resetting specified AUTO_INCREMENT value #32078

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c8784d
ddl: Add warning for resetting specified AUTO_INCREMENT value
dveeden Jan 31, 2022
2344933
Merge remote-tracking branch 'upstream/master' into auto_inc_force_wa…
dveeden Feb 16, 2022
6929ed8
Add test as contributed by @mjonss
dveeden Feb 16, 2022
5843b5f
Merge branch 'master' into auto_inc_force_warning
ti-chi-bot Mar 31, 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
17 changes: 17 additions & 0 deletions ddl/db_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,23 @@ func TestAutoIncrementForce(t *testing.T) {
tk.MustQuery("select * from t;").Check(testkit.Rows("101", "112", "500"))
tk.MustQuery("select * from t order by a;").Check(testkit.Rows("101", "112", "500"))
tk.MustExec("drop table if exists t;")

// Check for warning in case we can't set the auto_increment to the desired value
tk.MustExec("create table t(a int primary key auto_increment)")
tk.MustExec("insert into t values (200)")
tk.MustQuery("show create table t").Check(testkit.Rows(
"t CREATE TABLE `t` (\n" +
" `a` int(11) NOT NULL AUTO_INCREMENT,\n" +
" PRIMARY KEY (`a`) /*T![clustered_index] CLUSTERED */\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=5201"))
tk.MustExec("alter table t auto_increment=100;")
tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1105 Can't reset AUTO_INCREMENT to 100 without FORCE option, using 5201 instead"))
tk.MustQuery("show create table t").Check(testkit.Rows(
"t CREATE TABLE `t` (\n" +
" `a` int(11) NOT NULL AUTO_INCREMENT,\n" +
" PRIMARY KEY (`a`) /*T![clustered_index] CLUSTERED */\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=5201"))
tk.MustExec("drop table t")
}

func TestIssue20490(t *testing.T) {
Expand Down
9 changes: 8 additions & 1 deletion ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2981,10 +2981,17 @@ func (d *ddl) RebaseAutoID(ctx sessionctx.Context, ident ast.Ident, newBase int6
}

if !force {
newBase, err = adjustNewBaseToNextGlobalID(ctx, t, tp, newBase)
newBaseTemp, err := adjustNewBaseToNextGlobalID(ctx, t, tp, newBase)
if err != nil {
return err
}
if newBase != newBaseTemp {
ctx.GetSessionVars().StmtCtx.AppendWarning(
fmt.Errorf("Can't reset AUTO_INCREMENT to %d without FORCE option, using %d instead",
newBase, newBaseTemp,
))
}
newBase = newBaseTemp
}
job := &model.Job{
SchemaID: schema.ID,
Expand Down