Merge pull request #4830 from planetscale/ds-vtdb

default value for db_name
vitessio · Apr 24, 2019 · a92a0a7 · a92a0a7
2 parents 6c55f27 + 75e0822
commit a92a0a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/go/vt/mysqlctl/metadata_tables.go b/go/vt/mysqlctl/metadata_tables.go
@@ -44,11 +44,11 @@ const (
 
 var (
 	sqlAlterLocalMetadataTable = []string{
-		`ALTER TABLE _vt.local_metadata ADD COLUMN db_name VARBINARY(255) NOT NULL`,
+		`ALTER TABLE _vt.local_metadata ADD COLUMN db_name VARBINARY(255) NOT NULL DEFAULT ''`,
 		`ALTER TABLE _vt.local_metadata DROP PRIMARY KEY, ADD PRIMARY KEY(name, db_name)`,
 	}
 	sqlAlterShardMetadataTable = []string{
-		`ALTER TABLE _vt.shard_metadata ADD COLUMN db_name VARBINARY(255) NOT NULL`,
+		`ALTER TABLE _vt.shard_metadata ADD COLUMN db_name VARBINARY(255) NOT NULL DEFAULT ''`,
 		`ALTER TABLE _vt.shard_metadata DROP PRIMARY KEY, ADD PRIMARY KEY(name, db_name)`,
 	}
 )

diff --git a/...ow/reshardingworkflowgen/workflow_test.go → ...hardingworkflowgen/workflow_flaky_test.go b/...ow/reshardingworkflowgen/workflow_test.go → ...hardingworkflowgen/workflow_flaky_test.go