Merge branch 'xtm' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into xtm

knizhnik · knizhnik · commit 9328e8526d98 · 2015-09-10T19:43:46.000+03:00
diff --git a/contrib/pg_gtm/dtmd/bin/dtmd b/contrib/pg_gtm/dtmd/bin/dtmd
diff --git a/contrib/pg_gtm/pg_dtm.c b/contrib/pg_gtm/pg_dtm.c
@@ -71,8 +71,8 @@ typedef struct
     TransactionId xid;
 } DtmTransId;
               
-// #define DTM_TRACE(x) 
-#define DTM_TRACE(x) elog x
+#define DTM_TRACE(x) 
+// #define DTM_TRACE(x) elog x
 
 static shmem_startup_hook_type prev_shmem_startup_hook;
 static HTAB* xid2status;
diff --git a/contrib/pg_gtm/tests/transfers.go b/contrib/pg_gtm/tests/transfers.go
@@ -116,7 +116,7 @@ func transfer(id int, wg *sync.WaitGroup) {
         snapshot = execQuery(conn1, "select dtm_extend($1)", gtid)
         snapshot = execQuery(conn2, "select dtm_access($1, $2)", snapshot, gtid)
 
-        exec(conn1, "update t set v = v + $1 - 1 where u=$2", amount, account1)
+        exec(conn1, "update t set v = v + $1 where u=$2", amount, account1)
         exec(conn2, "update t set v = v - $1 where u=$2", amount, account2)
 
         exec(conn1, "prepare transaction '" + gtid + "'")
diff --git a/install.sh b/install.sh
@@ -21,7 +21,7 @@ cd ../..
 sed -i '' 's/#port =.*/port = 5433/' ./install/data2/postgresql.conf
 
 sed -i '' 's/#fsync =.*/fsync = off/' ./install/data1/postgresql.conf
-sed -i' ' 's/#fsync =.*/fsync = off/' ./install/data2/postgresql.conf
+sed -i '' 's/#fsync =.*/fsync = off/' ./install/data2/postgresql.conf
 
 
 ./install/bin/pg_ctl -D ./install/data1 -l ./install/data1/log start
