diff --git a/go/go.mod b/go/go.mod
index 47f7c2a4b89..28089d43c17 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078
 	github.com/dolthub/fslock v0.0.3
 	github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
-	github.com/dolthub/sqllogictest/go v0.0.0-20240222182842-573e6a164de8
+	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
 	github.com/dolthub/vitess v0.0.0-20240209125211-6c93b0341608
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.13.0
@@ -57,7 +57,7 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/creasty/defaults v1.6.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.17.1-0.20240224070646-d75d49c4ec20
+	github.com/dolthub/go-mysql-server v0.17.1-0.20240226201640-a9f896c0352d
 	github.com/dolthub/swiss v0.1.0
 	github.com/goccy/go-json v0.10.2
 	github.com/google/go-github/v57 v57.0.0
diff --git a/go/go.sum b/go/go.sum
index 05e6f6caf00..bbcf4aa8bc0 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -183,16 +183,16 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
 github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.17.1-0.20240224070646-d75d49c4ec20 h1:CAiVQ94yGzGiB4hVchI0exzzgndIYOIQ6JsTISQ4DVA=
-github.com/dolthub/go-mysql-server v0.17.1-0.20240224070646-d75d49c4ec20/go.mod h1:282SPNGdGzoUa1GfBr/kKNMzMDSn9+eKIUPvYxlxIdg=
+github.com/dolthub/go-mysql-server v0.17.1-0.20240226201640-a9f896c0352d h1:V5VPAZa6A2A9bCNZx7NiSGB8tb2PqHOh0gUHUgNxXN4=
+github.com/dolthub/go-mysql-server v0.17.1-0.20240226201640-a9f896c0352d/go.mod h1:282SPNGdGzoUa1GfBr/kKNMzMDSn9+eKIUPvYxlxIdg=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
 github.com/dolthub/jsonpath v0.0.2-0.20240201003050-392940944c15 h1:sfTETOpsrNJPDn2KydiCtDgVu6Xopq8k3JP8PjFT22s=
 github.com/dolthub/jsonpath v0.0.2-0.20240201003050-392940944c15/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577 h1:SegEguMxToBn045KRHLIUlF2/jR7Y2qD6fF+3tdOfvI=
 github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
-github.com/dolthub/sqllogictest/go v0.0.0-20240222182842-573e6a164de8 h1:nFOhaKpwXfts8HgCcHA43KvuYwosXTnk4y4VVxNEgvs=
-github.com/dolthub/sqllogictest/go v0.0.0-20240222182842-573e6a164de8/go.mod h1:e/FIZVvT2IR53HBCAo41NjqgtEnjMJGKca3Y/dAmZaA=
+github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
+github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
 github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc=
 github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ=
 github.com/dolthub/vitess v0.0.0-20240209125211-6c93b0341608 h1:jnInva1KcJJf/QQsxbN9tTJckOZf73EzUen8rrik0Yw=
diff --git a/go/libraries/doltcore/env/actions/infer_schema.go b/go/libraries/doltcore/env/actions/infer_schema.go
index 571dcfe1094..de99c155cba 100644
--- a/go/libraries/doltcore/env/actions/infer_schema.go
+++ b/go/libraries/doltcore/env/actions/infer_schema.go
@@ -340,6 +340,8 @@ func findCommonType(ts typeInfoSet) typeinfo.TypeInfo {
 		return typeinfo.TextType
 	} else if setHasType(ts, typeinfo.StringDefaultType) {
 		return typeinfo.StringDefaultType
+	} else if setHasType(ts, typeinfo.StringDefaultType) {
+		return typeinfo.StringDefaultType
 	}
 
 	hasNumeric := false
diff --git a/go/libraries/doltcore/schema/schema_impl.go b/go/libraries/doltcore/schema/schema_impl.go
index 93ea61fcf45..43af6bce4f9 100644
--- a/go/libraries/doltcore/schema/schema_impl.go
+++ b/go/libraries/doltcore/schema/schema_impl.go
@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/analyzer/analyzererrors"
 	gmstypes "github.com/dolthub/go-mysql-server/sql/types"
 	"github.com/dolthub/vitess/go/vt/proto/query"
 
@@ -178,6 +179,13 @@ func ValidateForInsert(allCols *ColCollection) error {
 			seenPkCol = true
 			break
 		}
+		c.TypeInfo.ToSqlType()
+	}
+
+	if rowLen := MaxRowStorageSize(allCols); rowLen > int64(val.MaxTupleDataSize) {
+		// |val.MaxTupleDataSize| is less than |types.MaxRowLength| to account for
+		// serial message metadata
+		return analyzererrors.ErrInvalidRowLength.New(val.MaxTupleDataSize, rowLen)
 	}
 
 	if !seenPkCol && !FeatureFlagKeylessSchema {
@@ -208,6 +216,42 @@ func ValidateForInsert(allCols *ColCollection) error {
 	return err
 }
 
+// MaxRowStorageSize returns the storage length for Dolt types.
+func MaxRowStorageSize(cols *ColCollection) int64 {
+	var numBytesPerRow int64 = 0
+	for _, col := range cols.cols {
+		switch n := col.TypeInfo.ToSqlType().(type) {
+		case sql.NumberType:
+			numBytesPerRow += 8
+		case sql.StringType:
+			if gmstypes.IsTextBlob(n) {
+				numBytesPerRow += 20
+			} else {
+				numBytesPerRow += n.MaxByteLength()
+			}
+		case gmstypes.BitType:
+			numBytesPerRow += 8
+		case sql.DatetimeType:
+			numBytesPerRow += 8
+		case sql.DecimalType:
+			numBytesPerRow += int64(n.MaximumScale())
+		case sql.EnumType:
+			numBytesPerRow += 2
+		case gmstypes.JsonType:
+			numBytesPerRow += 20
+		case sql.NullType:
+			numBytesPerRow += 1
+		case gmstypes.TimeType:
+			numBytesPerRow += 16
+		case sql.YearType:
+			numBytesPerRow += 8
+		default:
+			panic(fmt.Sprintf("unknown type in create table: %s", n.String()))
+		}
+	}
+	return numBytesPerRow
+}
+
 // isAutoIncrementKind returns true is |k| is a numeric kind.
 func isAutoIncrementKind(k types.NomsKind) bool {
 	return k == types.IntKind || k == types.UintKind || k == types.FloatKind
diff --git a/go/libraries/doltcore/schema/typeinfo/typeinfo.go b/go/libraries/doltcore/schema/typeinfo/typeinfo.go
index 51eccbcb313..fea78d8f5d8 100644
--- a/go/libraries/doltcore/schema/typeinfo/typeinfo.go
+++ b/go/libraries/doltcore/schema/typeinfo/typeinfo.go
@@ -17,7 +17,6 @@ package typeinfo
 import (
 	"context"
 	"fmt"
-	"math"
 
 	"github.com/dolthub/go-mysql-server/sql"
 	gmstypes "github.com/dolthub/go-mysql-server/sql/types"
@@ -363,7 +362,7 @@ func FromKind(kind types.NomsKind) TypeInfo {
 	case types.FloatKind:
 		return Float64Type
 	case types.InlineBlobKind:
-		return &inlineBlobType{gmstypes.MustCreateBinary(sqltypes.VarBinary, math.MaxUint16)}
+		return &inlineBlobType{gmstypes.MustCreateBinary(sqltypes.VarBinary, MaxVarcharLength/16)}
 	case types.IntKind:
 		return Int64Type
 	case types.JSONKind:
diff --git a/go/libraries/doltcore/schema/typeinfo/varstring.go b/go/libraries/doltcore/schema/typeinfo/varstring.go
index 3f3f224d91d..ed098e3ff9f 100644
--- a/go/libraries/doltcore/schema/typeinfo/varstring.go
+++ b/go/libraries/doltcore/schema/typeinfo/varstring.go
@@ -49,8 +49,9 @@ type varStringType struct {
 var _ TypeInfo = (*varStringType)(nil)
 
 var (
-	MaxVarcharLength  = int64(16383)
-	StringDefaultType = &varStringType{gmstypes.MustCreateStringWithDefaults(sqltypes.VarChar, MaxVarcharLength)}
+	MaxVarcharLength = int64(16383)
+	// StringDefaultType is sized to 1k, which allows up to 16 fields per row
+	StringDefaultType = &varStringType{gmstypes.MustCreateStringWithDefaults(sqltypes.VarChar, MaxVarcharLength/16)}
 )
 
 func CreateVarStringTypeFromSqlType(stringType sql.StringType) TypeInfo {
diff --git a/go/libraries/doltcore/sqle/dtables/docs_table.go b/go/libraries/doltcore/sqle/dtables/docs_table.go
index 0ea5fc4b967..94f474013a9 100644
--- a/go/libraries/doltcore/sqle/dtables/docs_table.go
+++ b/go/libraries/doltcore/sqle/dtables/docs_table.go
@@ -57,10 +57,12 @@ func (dt *DocsTable) String() string {
 	return doltdb.DocTableName
 }
 
+const defaultStringsLen = 16383 / 16
+
 // Schema is a sql.Table interface function that gets the sql.Schema of the dolt_docs system table.
 func (dt *DocsTable) Schema() sql.Schema {
 	return []*sql.Column{
-		{Name: doltdb.DocPkColumnName, Type: sqlTypes.MustCreateString(sqltypes.VarChar, 16383, sql.Collation_Default), Source: doltdb.DocTableName, PrimaryKey: true, Nullable: false},
+		{Name: doltdb.DocPkColumnName, Type: sqlTypes.MustCreateString(sqltypes.VarChar, defaultStringsLen, sql.Collation_Default), Source: doltdb.DocTableName, PrimaryKey: true, Nullable: false},
 		{Name: doltdb.DocTextColumnName, Type: sqlTypes.LongText, Source: doltdb.DocTableName, PrimaryKey: false},
 	}
 }
diff --git a/go/libraries/doltcore/sqle/enginetest/ddl_queries.go b/go/libraries/doltcore/sqle/enginetest/ddl_queries.go
index a5664ed69b9..65b7800201e 100755
--- a/go/libraries/doltcore/sqle/enginetest/ddl_queries.go
+++ b/go/libraries/doltcore/sqle/enginetest/ddl_queries.go
@@ -86,7 +86,7 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people modify column first_name varchar(16383) not null after last_name",
+				Query:            "alter table people modify column first_name varchar(163) not null after last_name",
 				SkipResultsCheck: true,
 			},
 			{
@@ -94,7 +94,7 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
 					"  `id` int NOT NULL,\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
-					"  `first_name` varchar(16383) NOT NULL,\n" +
+					"  `first_name` varchar(163) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
 					"  `age` int,\n" +
 					"  `rating` float,\n" +
@@ -121,13 +121,13 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people modify column first_name varchar(16383) not null first",
+				Query:            "alter table people modify column first_name varchar(163) not null first",
 				SkipResultsCheck: true,
 			},
 			{
 				Query: "show create table people",
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
-					"  `first_name` varchar(16383) NOT NULL,\n" +
+					"  `first_name` varchar(163) NOT NULL,\n" +
 					"  `id` int NOT NULL,\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
@@ -156,14 +156,14 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people modify column first_name varchar(16383) null",
+				Query:            "alter table people modify column first_name varchar(163) null",
 				SkipResultsCheck: true,
 			},
 			{
 				Query: "show create table people",
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
 					"  `id` int NOT NULL,\n" +
-					"  `first_name` varchar(16383),\n" +
+					"  `first_name` varchar(163),\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
 					"  `age` int,\n" +
@@ -184,7 +184,7 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people change first_name christian_name varchar(16383) not null after last_name",
+				Query:            "alter table people change first_name christian_name varchar(163) not null after last_name",
 				SkipResultsCheck: true,
 			},
 			{
@@ -192,7 +192,7 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
 					"  `id` int NOT NULL,\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
-					"  `christian_name` varchar(16383) NOT NULL,\n" +
+					"  `christian_name` varchar(163) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
 					"  `age` int,\n" +
 					"  `rating` float,\n" +
@@ -219,13 +219,13 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people change column first_name christian_name varchar(16383) not null first",
+				Query:            "alter table people change column first_name christian_name varchar(163) not null first",
 				SkipResultsCheck: true,
 			},
 			{
 				Query: "show create table people",
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
-					"  `christian_name` varchar(16383) NOT NULL,\n" +
+					"  `christian_name` varchar(163) NOT NULL,\n" +
 					"  `id` int NOT NULL,\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
@@ -254,14 +254,14 @@ var ModifyAndChangeColumnScripts = []queries.ScriptTest{
 		SetUpScript: SimpsonsSetup,
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "alter table people change column first_name first_name varchar(16383) null",
+				Query:            "alter table people change column first_name first_name varchar(163) null",
 				SkipResultsCheck: true,
 			},
 			{
 				Query: "show create table people",
 				Expected: []sql.Row{sql.Row{"people", "CREATE TABLE `people` (\n" +
 					"  `id` int NOT NULL,\n" +
-					"  `first_name` varchar(16383),\n" +
+					"  `first_name` varchar(163),\n" +
 					"  `last_name` varchar(100) NOT NULL,\n" +
 					"  `is_married` tinyint,\n" +
 					"  `age` int,\n" +
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
index f204802fe02..164003613d6 100644
--- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
@@ -596,6 +596,10 @@ func TestIgnoreIntoWithDuplicateUniqueKeyKeylessPrepared(t *testing.T) {
 func TestInsertIntoErrors(t *testing.T) {
 	h := newDoltHarness(t)
 	defer h.Close()
+	h = h.WithSkippedQueries([]string{
+		"create table bad (vb varbinary(65535))",
+		"insert into bad values (repeat('0', 65536))",
+	})
 	enginetest.TestInsertIntoErrors(t, h)
 }
 
@@ -880,6 +884,12 @@ func TestCreateTable(t *testing.T) {
 	enginetest.TestCreateTable(t, h)
 }
 
+func TestRowLimit(t *testing.T) {
+	h := newDoltHarness(t)
+	defer h.Close()
+	enginetest.TestRowLimit(t, h)
+}
+
 func TestBranchDdl(t *testing.T) {
 	for _, script := range DdlBranchTests {
 		func() {
@@ -2719,6 +2729,10 @@ func TestInsertErrorScriptsPrepared(t *testing.T) {
 	skipPreparedTests(t)
 	h := newDoltHarness(t)
 	defer h.Close()
+	h = h.WithSkippedQueries([]string{
+		"create table bad (vb varbinary(65535))",
+		"insert into bad values (repeat('0', 65536))",
+	})
 	enginetest.TestInsertErrorScriptsPrepared(t, h)
 }
 
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
index 084c9dbaa20..b233a4b7bca 100644
--- a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
+++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
@@ -3414,7 +3414,7 @@ var MergeArtifactsScripts = []queries.ScriptTest{
 	{
 		Name: "regression test for bad column ordering in schema",
 		SetUpScript: []string{
-			"CREATE TABLE t (col1 enum ('A', 'B'), col2 varchar(max), primary key (col2));",
+			"CREATE TABLE t (col1 enum ('A', 'B'), col2 varchar(100), primary key (col2));",
 			"ALTER TABLE t add unique index (col1);",
 			"call DOLT_COMMIT('-Am', 'initial');",
 
diff --git a/go/libraries/doltcore/sqle/sqlinsert_test.go b/go/libraries/doltcore/sqle/sqlinsert_test.go
index d5c0c22d6bb..2dc980a5ae9 100644
--- a/go/libraries/doltcore/sqle/sqlinsert_test.go
+++ b/go/libraries/doltcore/sqle/sqlinsert_test.go
@@ -238,7 +238,7 @@ var BasicInsertTests = []InsertTest{
 	{
 		Name: "insert partial columns existing pk",
 		AdditionalSetup: ExecuteSetupSQL(context.Background(), `
-			CREATE TABLE temppeople (id bigint primary key, first_name varchar(16383), last_name varchar(16383));
+			CREATE TABLE temppeople (id bigint primary key, first_name varchar(1023), last_name varchar(1023));
 			INSERT INTO temppeople VALUES (2, 'Bart', 'Simpson');`),
 		InsertQuery: "insert into temppeople (id, first_name, last_name) values (2, 'Bart', 'Simpson')",
 		ExpectedErr: "duplicate primary key",
diff --git a/go/libraries/doltcore/sqle/sqlreplace_test.go b/go/libraries/doltcore/sqle/sqlreplace_test.go
index 95e60de2149..a5469af2f5c 100644
--- a/go/libraries/doltcore/sqle/sqlreplace_test.go
+++ b/go/libraries/doltcore/sqle/sqlreplace_test.go
@@ -230,7 +230,7 @@ var BasicReplaceTests = []ReplaceTest{
 	{
 		Name: "replace partial columns existing pk",
 		AdditionalSetup: ExecuteSetupSQL(context.Background(), `
-			CREATE TABLE temppeople (id bigint primary key, first_name varchar(16383), last_name varchar(16383), num bigint);
+			CREATE TABLE temppeople (id bigint primary key, first_name varchar(1023), last_name varchar(1023), num bigint);
 			INSERT INTO temppeople VALUES (2, 'Bart', 'Simpson', 44);`),
 		ReplaceQuery: "replace into temppeople (id, first_name, last_name, num) values (2, 'Bart', 'Simpson', 88)",
 		SelectQuery:  "select id, first_name, last_name, num from temppeople where id = 2 ORDER BY id",
diff --git a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go
index eb3aa12a817..ede57a370ad 100644
--- a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go
+++ b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go
@@ -43,11 +43,11 @@ func TestEndToEnd(t *testing.T) {
 	tableName := "people"
 	dropCreateStatement := sqlfmt.DropTableIfExistsStmt(tableName) + "\n" +
 		"CREATE TABLE `people` (\n" +
-		"  `id` varchar(16383) NOT NULL,\n" +
-		"  `name` varchar(16383) NOT NULL,\n" +
+		"  `id` varchar(1023) NOT NULL,\n" +
+		"  `name` varchar(1023) NOT NULL,\n" +
 		"  `age` bigint unsigned NOT NULL,\n" +
 		"  `is_married` bigint NOT NULL,\n" +
-		"  `title` varchar(16383),\n" +
+		"  `title` varchar(1023),\n" +
 		"  PRIMARY KEY (`id`),\n" +
 		"  KEY `idx_name` (`name`),\n" +
 		"  CONSTRAINT `test-check` CHECK ((`age` < 123))\n" +
diff --git a/go/store/prolly/tree/prolly_fields.go b/go/store/prolly/tree/prolly_fields.go
index 99e9f332f4b..b8e760154fb 100644
--- a/go/store/prolly/tree/prolly_fields.go
+++ b/go/store/prolly/tree/prolly_fields.go
@@ -221,7 +221,7 @@ func PutField(ctx context.Context, ns NodeStore, tb *val.TupleBuilder, i int, v
 	case val.SetEnc:
 		tb.PutSet(i, v.(uint64))
 	case val.StringEnc:
-		tb.PutString(i, v.(string))
+		return tb.PutString(i, v.(string))
 	case val.ByteStringEnc:
 		if s, ok := v.(string); ok {
 			if len(s) > math.MaxUint16 {
diff --git a/go/store/val/tuple.go b/go/store/val/tuple.go
index 6382081bf86..0a2ff3d9623 100644
--- a/go/store/val/tuple.go
+++ b/go/store/val/tuple.go
@@ -17,14 +17,23 @@ package val
 import (
 	"math"
 
+	"github.com/dolthub/dolt/go/store/hash"
+
 	"github.com/dolthub/dolt/go/store/pool"
 )
 
 const (
-	MaxTupleFields            = 4096
-	MaxTupleDataSize ByteSize = math.MaxUint16
-
-	countSize ByteSize = 2
+	MaxTupleFields          = 4096
+	countSize      ByteSize = 2
+	nodeCountSize           = uint64Size
+	treeLevelSize           = uint8Size
+
+	// MaxTupleDataSize is the maximum KV length considering the extra
+	// flatbuffer metadata required to serialize the message. This number
+	// implicitly checks the "last row" size that will append chunk level
+	// metadata. Key and value offsets per field are excluded from this number.
+	// (uint16) - (field count) - (content hash) - (node count) - (tree level)
+	MaxTupleDataSize ByteSize = math.MaxUint16 - countSize - hash.ByteLen - nodeCountSize - treeLevelSize
 )
 
 // A Tuple is a vector of fields encoded as a byte slice. Key-Value Tuple pairs
diff --git a/go/store/val/tuple_builder.go b/go/store/val/tuple_builder.go
index 3cee278f071..f92bc8ce1cb 100644
--- a/go/store/val/tuple_builder.go
+++ b/go/store/val/tuple_builder.go
@@ -17,6 +17,7 @@ package val
 import (
 	"time"
 
+	"github.com/dolthub/go-mysql-server/sql/analyzer/analyzererrors"
 	"github.com/shopspring/decimal"
 
 	"github.com/dolthub/dolt/go/store/hash"
@@ -292,13 +293,21 @@ func (tb *TupleBuilder) PutSet(i int, v uint64) {
 }
 
 // PutString writes a string to the ith field of the Tuple being built.
-func (tb *TupleBuilder) PutString(i int, v string) {
+func (tb *TupleBuilder) PutString(i int, v string) error {
 	tb.Desc.expectEncoding(i, StringEnc)
 	sz := ByteSize(len(v)) + 1
+	offSz := 0
+	if i > 0 {
+		offSz = 2 * int(uint16Size)
+	}
+	if int(tb.pos)+len(v)+offSz > int(MaxTupleDataSize) {
+		return analyzererrors.ErrInvalidRowLength.New(MaxTupleDataSize, int(tb.pos)+len(v)+int(offsetsSize(i)))
+	}
 	tb.ensureCapacity(sz)
 	tb.fields[i] = tb.buf[tb.pos : tb.pos+sz]
 	writeString(tb.fields[i], v)
 	tb.pos += sz
+	return nil
 }
 
 // PutByteString writes a []byte to the ith field of the Tuple being built.
diff --git a/integration-tests/bats/blame-system-view.bats b/integration-tests/bats/blame-system-view.bats
index 91656de67bb..0ee64401199 100644
--- a/integration-tests/bats/blame-system-view.bats
+++ b/integration-tests/bats/blame-system-view.bats
@@ -147,13 +147,13 @@ SQL
     run dolt sql -q "describe dolt_blame_blame_test;"
     [ "$status" -eq 0 ]
 
-    [[ "$output" =~ "+-------------+----------------+------+-----+---------+-------+" ]] || false
-    [[ "$output" =~ "| pk1         | bigint         | YES  |     | NULL    |       |" ]] || false
-    [[ "$output" =~ "| commit      | varchar(16383) | YES  |     | NULL    |       |" ]] || false
-    [[ "$output" =~ "| commit_date | datetime(6)    | YES  |     | NULL    |       |" ]] || false
-    [[ "$output" =~ "| committer   | text           | NO   |     | NULL    |       |" ]] || false
-    [[ "$output" =~ "| email       | text           | NO   |     | NULL    |       |" ]] || false
-    [[ "$output" =~ "| message     | text           | NO   |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "+-------------+---------------+------+-----+---------+-------+" ]] || false
+    [[ "$output" =~ "| pk1         | bigint        | YES  |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "| commit      | varchar(1023) | YES  |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "| commit_date | datetime(6)   | YES  |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "| committer   | text          | NO   |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "| email       | text          | NO   |     | NULL    |       |" ]] || false
+    [[ "$output" =~ "| message     | text          | NO   |     | NULL    |       |" ]] || false
 }
 
 @test "blame-system-view: view is not included in show tables output" {
diff --git a/integration-tests/bats/import-create-tables.bats b/integration-tests/bats/import-create-tables.bats
index 3ff89d1aa6c..c50a4274406 100755
--- a/integration-tests/bats/import-create-tables.bats
+++ b/integration-tests/bats/import-create-tables.bats
@@ -589,7 +589,7 @@ DELIM
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\`" ]] || false
     [[ "$output" =~ "\`pk\` int" ]] || false
-    [[ "$output" =~ "\`str\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`str\` varchar(1023)" ]] || false
     [[ "$output" =~ "\`int\` int" ]] || false
     [[ "$output" =~ "\`bool\` tinyint" ]] || false
     [[ "$output" =~ "\`float\` float" ]] || false
@@ -888,9 +888,9 @@ DELIM
 
     run dolt sql -q "describe test"
     [ "$status" -eq 0 ]
-    [[ "$output" =~ "| id    | varchar(16383) |" ]] || false
-    [[ "$output" =~ "| state | text           |" ]] || false
-    [[ "$output" =~ "| data  | text           |" ]] || false
+    [[ "$output" =~ "| id    | varchar(1023) |" ]] || false
+    [[ "$output" =~ "| state | text          |" ]] || false
+    [[ "$output" =~ "| data  | text          |" ]] || false
 
     # pk defaults to first column if not explicitly defined
     run dolt table import -c --all-text test2 test.csv
@@ -899,13 +899,13 @@ DELIM
 
     run dolt sql -q "describe test2"
     [ "$status" -eq 0 ]
-    [[ "$output" =~ "| id    | varchar(16383) |" ]] || false
-    [[ "$output" =~ "| state | text           |" ]] || false
-    [[ "$output" =~ "| data  | text           |" ]] || false
+    [[ "$output" =~ "| id    | varchar(1023) |" ]] || false
+    [[ "$output" =~ "| state | text          |" ]] || false
+    [[ "$output" =~ "| data  | text          |" ]] || false
 }
 
 @test "import-create-tables: --all-text and --schema are mutually exclusive" {
     run dolt table import -c -s `batshelper employees-sch.sql` --all-text employees `batshelper employees-tbl.json`
     [ "$status" -eq 1 ]
     [[ "$output" =~ "parameters all-text and schema are mutually exclusive" ]] || false
-}
\ No newline at end of file
+}
diff --git a/integration-tests/bats/schema-import.bats b/integration-tests/bats/schema-import.bats
index 88c47c4fdf7..5b66f997c4a 100755
--- a/integration-tests/bats/schema-import.bats
+++ b/integration-tests/bats/schema-import.bats
@@ -116,7 +116,7 @@ teardown() {
     [[ "${lines[0]}" =~ "test" ]] || false
     [[ "$output" =~ "\`pk\` int" ]] || false
     [[ "$output" =~ "\`int\` int" ]] || false
-    [[ "$output" =~ "\`string\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`string\` varchar(1023)" ]] || false
     [[ "$output" =~ "\`boolean\` tinyint" ]] || false
     [[ "$output" =~ "\`float\` float" ]] || false
     [[ "$output" =~ "\`uint\` int" ]] || false
@@ -141,7 +141,7 @@ DELIM
     [[ "${lines[0]}" =~ "test" ]] || false
     [[ "$output" =~ "\`pk\` int" ]] || false
     [[ "$output" =~ "\`int\` int" ]] || false
-    [[ "$output" =~ "\`string\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`string\` varchar(1023)" ]] || false
     [[ "$output" =~ "\`boolean\` tinyint" ]] || false
     [[ "$output" =~ "\`float\` float" ]] || false
     [[ "$output" =~ "\`uint\` int" ]] || false
@@ -201,8 +201,8 @@ DELIM
     [ "$status" -eq 0 ]
     [ "${#lines[@]}" -eq 7 ]
     [[ "${lines[0]}" =~ "test" ]] || false
-    [[ "$output" =~ "\`pk\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`headerOne\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`pk\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`headerOne\` varchar(1023)" ]] || false
     [[ "$output" =~ "\`headerTwo\` int" ]] || false
 }
 
@@ -227,7 +227,7 @@ DELIM
     [[ "$output" =~ "\`c3\` int" ]] || false
     [[ "$output" =~ "\`c4\` int" ]] || false
     [[ "$output" =~ "\`c5\` int" ]] || false
-    [[ "$output" =~ "\`c6\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`c6\` varchar(1023)" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
@@ -243,12 +243,12 @@ DELIM
     [ "${#lines[@]}" -eq 11 ]
     [[ "${lines[0]}" =~ "test" ]] || false
     [[ "$output" =~ "\`pk\` int" ]] || false
-    [[ "$output" =~ "\`c1\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`c2\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`c3\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`c4\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`c5\` varchar(16383)" ]] || false
-    [[ "$output" =~ "\`c6\` varchar(16383)" ]] || false
+    [[ "$output" =~ "\`c1\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`c2\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`c3\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`c4\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`c5\` varchar(1023)" ]] || false
+    [[ "$output" =~ "\`c6\` varchar(1023)" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
@@ -295,7 +295,7 @@ DELIM
 
     run dolt diff --schema
     [ "$status" -eq 0 ]
-    [[ "$output" =~ '+  `x` varchar(16383),' ]] || false
+    [[ "$output" =~ '+  `x` varchar(1023),' ]] || false
     [[ "$output" =~ '+  `y` float,' ]] || false
     [[ "$output" =~ '+  `z` int,' ]] || false
     # assert no columns were deleted/replaced
@@ -331,7 +331,7 @@ DELIM
 
     run dolt diff --schema
     [ "$status" -eq 0 ]
-    [[ "$output" =~ '+  `x` varchar(16383),' ]] || false
+    [[ "$output" =~ '+  `x` varchar(1023),' ]] || false
     [[ "$output" =~ '+  `y` float,' ]] || false
     [[ "$output" =~ '+  `z` int,' ]] || false
     # assert no columns were deleted/replaced
@@ -373,7 +373,7 @@ DELIM
 
     run dolt diff --schema
     [ "$status" -eq 0 ]
-    [[ "$output" =~ '-  `a` varchar(16383),' ]] || false
+    [[ "$output" =~ '-  `a` varchar(1023),' ]] || false
     [[ "$output" =~ '-  `b` float,' ]] || false
     [[ "$output" =~ '-  `c` tinyint(1),' ]] || false
     # assert no columns were added