From 405c6bbabaeceea6bece68ebcb28a3473a77f8b3 Mon Sep 17 00:00:00 2001 From: cncal Date: Mon, 18 Jan 2021 14:29:48 +0800 Subject: [PATCH] *: make 'tidb_enable_change_column_type' available as a session variable (#20399) --- executor/set_test.go | 12 +++++++++--- sessionctx/variable/sysvar.go | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/executor/set_test.go b/executor/set_test.go index d94014defa..05b20812e7 100644 --- a/executor/set_test.go +++ b/executor/set_test.go @@ -408,11 +408,17 @@ func (s *testSerialSuite1) TestSetVar(c *C) { tk.MustQuery("select @@session.tidb_store_limit;").Check(testkit.Rows("0")) tk.MustQuery("select @@global.tidb_store_limit;").Check(testkit.Rows("100")) - tk.MustQuery("select @@tidb_enable_change_column_type;").Check(testkit.Rows("0")) + tk.MustQuery("select @@global.tidb_enable_change_column_type;").Check(testkit.Rows("0")) tk.MustExec("set global tidb_enable_change_column_type = 1") - tk.MustQuery("select @@tidb_enable_change_column_type;").Check(testkit.Rows("1")) + tk.MustQuery("select @@global.tidb_enable_change_column_type;").Check(testkit.Rows("1")) tk.MustExec("set global tidb_enable_change_column_type = off") - tk.MustQuery("select @@tidb_enable_change_column_type;").Check(testkit.Rows("0")) + tk.MustQuery("select @@global.tidb_enable_change_column_type;").Check(testkit.Rows("0")) + // test tidb_enable_change_column_type in session scope. + tk.MustQuery("select @@session.tidb_enable_change_column_type;").Check(testkit.Rows("0")) + tk.MustExec("set @@session.tidb_enable_change_column_type = 1") + tk.MustQuery("select @@session.tidb_enable_change_column_type;").Check(testkit.Rows("1")) + tk.MustExec("set @@session.tidb_enable_change_column_type = off") + tk.MustQuery("select @@session.tidb_enable_change_column_type;").Check(testkit.Rows("0")) tk.MustQuery("select @@session.tidb_metric_query_step;").Check(testkit.Rows("60")) tk.MustExec("set @@session.tidb_metric_query_step = 120") diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 7e8bb56dea..ca261fcc86 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -660,7 +660,7 @@ var defaultSysVars = []*SysVar{ {Scope: ScopeGlobal, Name: TiDBDDLErrorCountLimit, Value: strconv.Itoa(DefTiDBDDLErrorCountLimit), Type: TypeUnsigned, MinValue: 0, MaxValue: uint64(math.MaxInt64), AutoConvertOutOfRange: true}, {Scope: ScopeSession, Name: TiDBDDLReorgPriority, Value: "PRIORITY_LOW"}, {Scope: ScopeGlobal, Name: TiDBMaxDeltaSchemaCount, Value: strconv.Itoa(DefTiDBMaxDeltaSchemaCount), Type: TypeUnsigned, MinValue: 100, MaxValue: 16384, AutoConvertOutOfRange: true}, - {Scope: ScopeGlobal, Name: TiDBEnableChangeColumnType, Value: BoolToOnOff(DefTiDBChangeColumnType), Type: TypeBool}, + {Scope: ScopeGlobal | ScopeSession, Name: TiDBEnableChangeColumnType, Value: BoolToOnOff(DefTiDBChangeColumnType), Type: TypeBool}, {Scope: ScopeGlobal, Name: TiDBEnableChangeMultiSchema, Value: BoolToOnOff(DefTiDBChangeMultiSchema), Type: TypeBool}, {Scope: ScopeGlobal, Name: TiDBEnablePointGetCache, Value: BoolToOnOff(DefTiDBPointGetCache), Type: TypeBool}, {Scope: ScopeGlobal, Name: TiDBEnableAlterPlacement, Value: BoolToOnOff(DefTiDBEnableAlterPlacement), Type: TypeBool},