From 774e9d1efb1c6bfffd2aa05f8f841c409b80591d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 6 Nov 2018 21:18:42 +0200 Subject: [PATCH] Fix merge problems The values were not removed from the merge. --- server/modules/routing/avrorouter/avro_rbr.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/modules/routing/avrorouter/avro_rbr.cc b/server/modules/routing/avrorouter/avro_rbr.cc index 3be5e8d7a..53d204ccf 100644 --- 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))