fix client ERROR message

kelvich · kelvich · commit 982cc5b71234 · 2016-04-02T00:26:08.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2135,7 +2135,7 @@ static bool MtmRunUtilityStmt(PGconn* conn, char const* sql, char **errmsg)
 		*errmsg = palloc0(errlen);
 
 		/* Strip "ERROR:\t" from beginning and "\n" from end of error string */
-		strncpy(*errmsg, errstr + 7, errlen - 1 - 7);
+		strncpy(*errmsg, errstr + 8, errlen - 1 - 8);
 	}
 
 	PQclear(result);
diff --git a/contrib/mmts/tests/postgresql.conf.mm b/contrib/mmts/tests/postgresql.conf.mm
@@ -626,3 +626,4 @@
 
 multimaster.workers=8
 multimaster.queue_size=104857600 # 100mb
+multimaster.ignore_tables_without_pk=1
diff --git a/contrib/mmts/tests/reinit-mm.sh b/contrib/mmts/tests/reinit-mm.sh
@@ -6,6 +6,8 @@ pkill -9 arbiter
 
 cd ~/code/postgres_cluster/contrib/mmts/
 make install
+cd ~/code/postgres_cluster/contrib/raftable/
+make install
 cd ~/code/postgres_cluster/contrib/mmts/tests
 
 
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
@@ -70,7 +70,7 @@ test: triggers
 test: inherit
 test: create_table_like
 test: typed_table
-test: vacuum
+#test: vacuum
 test: drop_if_exists
 test: updatable_views
 test: rolenames
@@ -107,7 +107,7 @@ test: spgist
 test: privileges
 test: security_label
 test: collate
-test: matview
+#test: matview
 test: lock
 test: replica_identity
 test: rowsecurity
@@ -143,7 +143,7 @@ test: indirect_toast
 test: equivclass
 test: plancache
 test: limit
-test: plpgsql
+#test: plpgsql
 test: copy2
 test: temp
 test: domain

Original file line number	Diff line number	Diff line change
`@@ -2135,7 +2135,7 @@ static bool MtmRunUtilityStmt(PGconn* conn, char const* sql, char **errmsg)`
`2135`	`2135`	`*errmsg = palloc0(errlen);`
`2136`	`2136`
`2137`	`2137`	`/* Strip "ERROR:\t" from beginning and "\n" from end of error string */`
`2138`		`- strncpy(*errmsg, errstr + 7, errlen - 1 - 7);`
	`2138`	`+ strncpy(*errmsg, errstr + 8, errlen - 1 - 8);`
`2139`	`2139`	`}`
`2140`	`2140`
`2141`	`2141`	`PQclear(result);`
Original file line number	Diff line number	Diff line change
`@@ -626,3 +626,4 @@`
`626`	`626`
`627`	`627`	`multimaster.workers=8`
`628`	`628`	`multimaster.queue_size=104857600 # 100mb`
	`629`	`+multimaster.ignore_tables_without_pk=1`