hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge problems

Browse Source 
The values were not removed from the merge.
This commit is contained in:
Markus Mäkelä
2018-11-06 21:18:42 +02:00
parent 383b0b1989
commit 774e9d1efb
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/avrorouter/avro_rbr.cc
View File

@ -264,8 +264,6 @@ uint8_t* process_row_event_data(STableMapEvent map,
{ {
if (bit_is_set(columns_present, ncolumns, i)) if (bit_is_set(columns_present, ncolumns, i))
{ {
avro_value_t field;
avro_value_set_branch(&union_value, 1, &field);
npresent++; npresent++;
if (bit_is_set(null_bitmap, ncolumns, i)) if (bit_is_set(null_bitmap, ncolumns, i))