planner, util: new unfixed mutrow for TypeNull

pingcap · Jun 10, 2020 · 23f9cad · 23f9cad
1 parent e053ce0
commit 23f9cad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/planner/core/integration_test.go b/planner/core/integration_test.go
@@ -1117,3 +1117,14 @@ func (s *testIntegrationSuite) TestHintParserWarnings(c *C) {
 	rows := tk.MustQuery("show warnings;").Rows()
 	c.Assert(len(rows), Equals, 1)
 }
+
+func (s *testIntegrationSuite) TestIssue16935(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t0;")
+	tk.MustExec("CREATE TABLE t0(c0 INT);")
+	tk.MustExec("INSERT INTO t0(c0) VALUES (1), (1), (1), (1), (1), (1);")
+	tk.MustExec("CREATE definer='root'@'localhost' VIEW v0(c0) AS SELECT NULL FROM t0;")
+
+	tk.MustQuery("SELECT * FROM t0 LEFT JOIN v0 ON TRUE WHERE v0.c0 IS NULL;")
+}
diff --git a/util/chunk/codec.go b/util/chunk/codec.go
@@ -173,7 +173,7 @@ func getFixedLen(colType *types.FieldType) int {
 	case mysql.TypeFloat:
 		return 4
 	case mysql.TypeTiny, mysql.TypeShort, mysql.TypeInt24, mysql.TypeLong,
-		mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeYear, mysql.TypeDuration, mysql.TypeNull:
+		mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeYear, mysql.TypeDuration:
 		return 8
 	case mysql.TypeDate, mysql.TypeDatetime, mysql.TypeTimestamp:
 		return sizeTime

diff --git a/util/chunk/mutrow.go b/util/chunk/mutrow.go
@@ -121,7 +121,7 @@ func zeroValForType(tp *types.FieldType) interface{} {
 func makeMutRowColumn(in interface{}) *Column {
 	switch x := in.(type) {
 	case nil:
-		col := makeMutRowUint64Column(uint64(0))
+		col := makeMutRowBytesColumn(nil)
 		col.nullBitmap[0] = 0
 		return col
 	case int: