Skip to content

Commit 4cabc60

Browse files
committed
correct temporal fields in max_display_length_for_field()
it's *display length* (a.k.a. field_length) not storage length (a.k.a. pack_length)
1 parent d4b1425 commit 4cabc60

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sql/rpl_utility.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,22 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
9898
return 3;
9999

100100
case MYSQL_TYPE_DATE:
101-
case MYSQL_TYPE_TIME:
102101
return 3;
103102

103+
case MYSQL_TYPE_TIME:
104+
return MIN_TIME_WIDTH;
105+
104106
case MYSQL_TYPE_TIME2:
105107
return max_display_length_for_temporal2_field(MIN_TIME_WIDTH, metadata);
106108

107109
case MYSQL_TYPE_TIMESTAMP:
108-
return 4;
110+
return MAX_DATETIME_WIDTH;
109111

110112
case MYSQL_TYPE_TIMESTAMP2:
111113
return max_display_length_for_temporal2_field(MAX_DATETIME_WIDTH, metadata);
112114

113115
case MYSQL_TYPE_DATETIME:
114-
return 8;
116+
return MAX_DATETIME_WIDTH;
115117

116118
case MYSQL_TYPE_DATETIME2:
117119
return max_display_length_for_temporal2_field(MAX_DATETIME_WIDTH, metadata);

0 commit comments

Comments
 (0)