Fix merge problems

The values were not removed from the merge.
2018-11-06 21:18:42 +02:00 · 2018-11-06 21:18:42 +02:00 · 774e9d1efb
commit 774e9d1efb
parent 383b0b1989
1 changed files with 0 additions and 2 deletions
--- a/server/modules/routing/avrorouter/avro_rbr.cc
+++ b/server/modules/routing/avrorouter/avro_rbr.cc
@ -264,8 +264,6 @@ uint8_t* process_row_event_data(STableMapEvent map,
    {
        if (bit_is_set(columns_present, ncolumns, i))
        {
-            avro_value_t field;
-            avro_value_set_branch(&union_value, 1, &field);
            npresent++;

            if (bit_is_set(null_bitmap, ncolumns, i))