address comment

windtalker · Apr 30, 2020 · fe118f4 · fe118f4
1 parent 198e313
commit fe118f4
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/types/field_type.go b/types/field_type.go
@@ -313,9 +313,7 @@ func MergeFieldType(a byte, b byte) byte {
 // currently only NotNullFlag is checked
 // todo more flag need to be checked, for example: UnsignedFlag
 func mergeTypeFlag(a, b uint) uint {
-	ret := a
-	ret &= (a & b & mysql.NotNullFlag) | ^mysql.NotNullFlag
-	return ret
+	return a & (b&mysql.NotNullFlag | ^mysql.NotNullFlag)
 }
 
 func getFieldTypeIndex(tp byte) int {