Merge branch 'master' into rwmutex_replace_mutex

executor/stale_txn_test.go

@@ -1334,3 +1334,19 @@ func TestIssue30872(t *testing.T) {
 	tk.MustExec("set autocommit=0")
 	tk.MustQuery("select * from t1 as of timestamp @a").Check(testkit.Rows("1 10"))
 }
+
+func TestIssue33728(t *testing.T) {
+	store, _, clean := testkit.CreateMockStoreAndDomain(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t1 (id int primary key, v int)")
+	err := tk.ExecToErr("select * from t1 as of timestamp NULL")
+	require.Error(t, err)
+	require.Equal(t, "[planner:8135]invalid as of timestamp: as of timestamp cannot be NULL", err.Error())
+
+	err = tk.ExecToErr("start transaction read only as of timestamp NULL")
+	require.Error(t, err)
+	require.Equal(t, "[planner:8135]invalid as of timestamp: as of timestamp cannot be NULL", err.Error())
+}

sessiontxn/staleread/util.go

@@ -31,6 +31,11 @@ func CalculateAsOfTsExpr(sctx sessionctx.Context, asOfClause *ast.AsOfClause) (u
 	if err != nil {
 		return 0, err
 	}
+
+	if tsVal.IsNull() {
+		return 0, errAsOf.FastGenWithCause("as of timestamp cannot be NULL")
+	}
+
 	toTypeTimestamp := types.NewFieldType(mysql.TypeTimestamp)
 	// We need at least the millionsecond here, so set fsp to 3.
 	toTypeTimestamp.Decimal = 3