Skip to content

Commit 0f649f3

Browse files
Remove some unused MySQL 5.6 code (#16465)
Signed-off-by: Graham Campbell <hello@gjcampbell.co.uk>
1 parent 36f7193 commit 0f649f3

File tree

5 files changed

+3
-31
lines changed

5 files changed

+3
-31
lines changed

go/mysql/binlog_event.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ type BinlogFormat struct {
158158
HeaderSizes []byte
159159

160160
// ServerVersion is the name of the MySQL server version.
161-
// It starts with something like 5.6.33-xxxx.
161+
// It starts with something like 8.0.34-xxxx.
162162
ServerVersion string
163163

164164
// FormatVersion is the version number of the binlog file format.

go/mysql/capabilities/capability.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const (
4040
InstantAddDropColumnFlavorCapability // Adding/dropping column in any position/ordinal.
4141
InstantChangeColumnDefaultFlavorCapability //
4242
InstantExpandEnumCapability //
43-
MySQLJSONFlavorCapability // JSON type supported
4443
MySQLUpgradeInServerFlavorCapability //
4544
DynamicRedoLogCapacityFlavorCapability // supported in MySQL 8.0.30 and above: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-30.html
4645
DisableRedoLogFlavorCapability // supported in MySQL 8.0.21 and above: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html
@@ -89,8 +88,6 @@ func MySQLVersionHasCapability(serverVersion string, capability FlavorCapability
8988
}
9089
// Capabilities sorted by version.
9190
switch capability {
92-
case MySQLJSONFlavorCapability:
93-
return atLeast(5, 7, 0)
9491
case InstantDDLFlavorCapability,
9592
InstantExpandEnumCapability,
9693
InstantAddLastColumnFlavorCapability,

go/mysql/capabilities/capability_test.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func TestMySQLVersionCapableOf(t *testing.T) {
145145
isCapable: false,
146146
},
147147
{
148-
version: "5.6.7",
148+
version: "5.7.29",
149149
capability: InstantDDLFlavorCapability,
150150
isCapable: false,
151151
},
@@ -154,16 +154,6 @@ func TestMySQLVersionCapableOf(t *testing.T) {
154154
capability: TransactionalGtidExecutedFlavorCapability,
155155
isCapable: false,
156156
},
157-
{
158-
version: "5.6.7",
159-
capability: MySQLJSONFlavorCapability,
160-
isCapable: false,
161-
},
162-
{
163-
version: "5.7.29",
164-
capability: MySQLJSONFlavorCapability,
165-
isCapable: true,
166-
},
167157
{
168158
version: "8.0.30",
169159
capability: DynamicRedoLogCapacityFlavorCapability,

go/mysql/flavor_mysqlgr_test.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestMysqlGRSupportCapability(t *testing.T) {
8484
isCapable: false,
8585
},
8686
{
87-
version: "5.6.7",
87+
version: "5.7.29",
8888
capability: capabilities.InstantDDLFlavorCapability,
8989
isCapable: false,
9090
},
@@ -93,16 +93,6 @@ func TestMysqlGRSupportCapability(t *testing.T) {
9393
capability: capabilities.TransactionalGtidExecutedFlavorCapability,
9494
isCapable: false,
9595
},
96-
{
97-
version: "5.6.7",
98-
capability: capabilities.MySQLJSONFlavorCapability,
99-
isCapable: false,
100-
},
101-
{
102-
version: "5.7.29",
103-
capability: capabilities.MySQLJSONFlavorCapability,
104-
isCapable: true,
105-
},
10696
{
10797
version: "8.0.30",
10898
capability: capabilities.DynamicRedoLogCapacityFlavorCapability,

go/mysql/flavor_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ func TestServerVersionCapableOf(t *testing.T) {
5353
capability: capabilities.TransactionalGtidExecutedFlavorCapability,
5454
isCapable: false,
5555
},
56-
{
57-
version: "5.7.29",
58-
capability: capabilities.MySQLJSONFlavorCapability,
59-
isCapable: true,
60-
},
6156
{
6257
version: "8.0.30",
6358
capability: capabilities.DynamicRedoLogCapacityFlavorCapability,

0 commit comments

Comments
 (0)