Skip to content

Commit 6420a84

Browse files
gkodinovdahlerlend
authored andcommitted
Bug#37645678: Contribution: Document COM_FIELD_LIST metadata and default
value Added the missing default value description for COM_FIELD_LIST Fixed a typo Fixed the 3.2 packet description. Change-Id: I522d8818911e9451df98df8aa298356a29775ea1
1 parent ea6b92c commit 6420a84

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

mysys/pack.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ uint64_t net_field_length_ll(uchar **packet) {
110110
}
111111

112112
/*
113-
Store an integer with simple packing into a output package
113+
Store an integer with simple packing into an output package
114114
115115
SYNOPSIS
116116
net_store_length()

sql/protocol_classic.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,6 +3099,11 @@ bool Protocol_classic::end_result_metadata() {
30993099
<tr><td>@ref sect_protocol_basic_dt_string_fix "string[2]"</td>
31003100
<td>reserved</td>
31013101
<td>reserved for future use.</td></tr>
3102+
<tr><td colspan="3">if command was COM_FIELD_LIST {</td></tr>
3103+
<tr><td>@ref sect_protocol_basic_dt_string_le "string&lt;lenenc&gt;"</td>
3104+
<td>default value</td>
3105+
<td>NULL if 0xFB</td></tr>
3106+
<tr><td colspan="3">}</td></tr>
31023107
</table>
31033108
31043109
@note `decimals` and `column_length` can be used for text output formatting
@@ -3143,12 +3148,9 @@ bool Protocol_classic::end_result_metadata() {
31433148
<td>number of decimal digits</td></tr>
31443149
<tr><td colspan="3">}</td></tr>
31453150
<tr><td colspan="3">if command was COM_FIELD_LIST {</td></tr>
3146-
<tr><td>@ref sect_protocol_basic_dt_int_le "int&lt;lenenc&gt;"</td>
3147-
<td>length of default values</td>
3148-
<td>[02]</td></tr>
31493151
<tr><td>@ref sect_protocol_basic_dt_string_le "string&lt;lenenc&gt;"</td>
3150-
<td>default_values</td>
3151-
<td></td></tr>
3152+
<td>default_value</td>
3153+
<td>NULL if 0xFB</td></tr>
31523154
<tr><td colspan="3">}</td></tr>
31533155
</table>
31543156

0 commit comments

Comments
 (0)