Merge branch 'PGPROEE9_6_MULTIMASTER' into PGPROEE9_6

vbwagner · vbwagner · commit 8ec4070fa203 · 2017-03-23T17:37:28.000+03:00
diff --git a/contrib/mmts/pglogical_output.c b/contrib/mmts/pglogical_output.c
@@ -187,8 +187,8 @@ pg_decode_startup(LogicalDecodingContext * ctx, OutputPluginOptions *opt,
 										  ALLOCSET_DEFAULT_MINSIZE,
 										  ALLOCSET_DEFAULT_INITSIZE,
 										  ALLOCSET_DEFAULT_MAXSIZE);
-	data->allow_internal_basetypes = false;
-	data->allow_binary_basetypes = false;
+	data->allow_internal_basetypes = true;
+	data->allow_binary_basetypes = true;
 
 
 	ctx->output_plugin_private = data;
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -476,6 +476,7 @@ pglogical_write_tuple(StringInfo out, PGLogicalOutputData *data,
 		transfer_type = decide_datum_transfer(att, typclass,
 											  data->allow_internal_basetypes,
 											  data->allow_binary_basetypes);
+			
         pq_sendbyte(out, transfer_type);
 		switch (transfer_type)
 		{

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,7 @@ pglogical_write_tuple(StringInfo out, PGLogicalOutputData *data,`
`476`	`476`	`transfer_type = decide_datum_transfer(att, typclass,`
`477`	`477`	`data->allow_internal_basetypes,`
`478`	`478`	`data->allow_binary_basetypes);`
	`479`	`+`
`479`	`480`	`pq_sendbyte(out, transfer_type);`
`480`	`481`	`switch (transfer_type)`
`481`	`482`	`{`