Skip to content

Commit 3155040

Browse files
jackyspjackysp
authored
Revert "sessionctx: Error/warning on unsupported isolation levels (#8625)"
This reverts commit c27705a.
1 parent eedbc8d commit 3155040

File tree

3 files changed

+24
-42
lines changed

3 files changed

+24
-42
lines changed

‎executor/set_test.go‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -149,48 +149,37 @@ func (s *testSuite2) TestSetVar(c *C) {
149149
tk.MustExec("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED")
150150
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-COMMITTED"))
151151
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-COMMITTED"))
152-
// error
153-
_, err = tk.Exec("SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED")
154-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
155-
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-COMMITTED"))
156-
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-COMMITTED"))
157-
// Fails
158-
_, err = tk.Exec("SET GLOBAL TRANSACTION ISOLATION LEVEL SERIALIZABLE")
159-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
160-
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("REPEATABLE-READ"))
161-
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("REPEATABLE-READ"))
152+
tk.MustExec("SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED")
153+
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
154+
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
155+
tk.MustExec("SET GLOBAL TRANSACTION ISOLATION LEVEL SERIALIZABLE")
156+
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("SERIALIZABLE"))
157+
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("SERIALIZABLE"))
162158

163159
// test synonyms variables
164160
tk.MustExec("SET SESSION tx_isolation = 'READ-COMMITTED'")
165161
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-COMMITTED"))
166162
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-COMMITTED"))
167163

168-
_, err = tk.Exec("SET SESSION tx_isolation = 'READ-UNCOMMITTED'")
169-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
170-
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-COMMITTED"))
171-
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-COMMITTED"))
164+
tk.MustExec("SET SESSION tx_isolation = 'READ-UNCOMMITTED'")
165+
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
166+
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
172167

173-
// fails
174-
_, err = tk.Exec("SET SESSION transaction_isolation = 'SERIALIZABLE'")
175-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
176-
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("READ-COMMITTED"))
177-
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("READ-COMMITTED"))
168+
tk.MustExec("SET SESSION transaction_isolation = 'SERIALIZABLE'")
169+
tk.MustQuery("select @@session.tx_isolation").Check(testkit.Rows("SERIALIZABLE"))
170+
tk.MustQuery("select @@session.transaction_isolation").Check(testkit.Rows("SERIALIZABLE"))
178171

179-
// fails
180-
_, err = tk.Exec("SET GLOBAL transaction_isolation = 'SERIALIZABLE'")
181-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
182-
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("REPEATABLE-READ"))
183-
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("REPEATABLE-READ"))
172+
tk.MustExec("SET GLOBAL transaction_isolation = 'SERIALIZABLE'")
173+
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("SERIALIZABLE"))
174+
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("SERIALIZABLE"))
184175

185-
_, err = tk.Exec("SET GLOBAL transaction_isolation = 'READ-UNCOMMITTED'")
186-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
187-
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("REPEATABLE-READ"))
188-
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("REPEATABLE-READ"))
176+
tk.MustExec("SET GLOBAL transaction_isolation = 'READ-UNCOMMITTED'")
177+
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
178+
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))
189179

190-
_, err = tk.Exec("SET GLOBAL tx_isolation = 'SERIALIZABLE'")
191-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
192-
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("REPEATABLE-READ"))
193-
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("REPEATABLE-READ"))
180+
tk.MustExec("SET GLOBAL tx_isolation = 'SERIALIZABLE'")
181+
tk.MustQuery("select @@global.tx_isolation").Check(testkit.Rows("SERIALIZABLE"))
182+
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("SERIALIZABLE"))
194183

195184
tk.MustExec("SET SESSION tx_read_only = 1")
196185
tk.MustExec("SET SESSION tx_read_only = 0")
@@ -584,8 +573,9 @@ func (s *testSuite2) TestValidateSetVar(c *C) {
584573
result = tk.MustQuery("select @@tx_isolation;")
585574
result.Check(testkit.Rows("REPEATABLE-READ"))
586575

587-
_, err = tk.Exec("set @@tx_isolation='SERIALIZABLE'")
588-
c.Assert(terror.ErrorEqual(err, variable.ErrUnsupportedValueForVar), IsTrue, Commentf("err %v", err))
576+
tk.MustExec("set @@tx_isolation='SERIALIZABLE'")
577+
result = tk.MustQuery("select @@tx_isolation;")
578+
result.Check(testkit.Rows("SERIALIZABLE"))
589579
}
590580

591581
func (s *testSuite2) TestSelectGlobalVar(c *C) {

‎sessionctx/variable/session.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,10 +598,6 @@ func (s *SessionVars) WithdrawAllPreparedStmt() {
598598
func (s *SessionVars) SetSystemVar(name string, val string) error {
599599
switch name {
600600
case TxnIsolationOneShot:
601-
switch val {
602-
case "SERIALIZABLE", "READ-UNCOMMITTED":
603-
return ErrUnsupportedValueForVar.GenWithStackByArgs(name, val)
604-
}
605601
s.TxnIsolationLevelOneShot.State = 1
606602
s.TxnIsolationLevelOneShot.Value = val
607603
case TimeZone:

‎sessionctx/variable/varsutil.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,6 @@ func ValidateSetSystemVar(vars *SessionVars, name string, value string) (string,
427427
if !exists {
428428
return "", ErrWrongValueForVar.GenWithStackByArgs(name, value)
429429
}
430-
switch upVal {
431-
case "SERIALIZABLE", "READ-UNCOMMITTED":
432-
return "", ErrUnsupportedValueForVar.GenWithStackByArgs(name, value)
433-
}
434430
return upVal, nil
435431
case TiDBInitChunkSize:
436432
v, err := strconv.Atoi(value)

0 commit comments

Comments
 (0)
⚡