Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5faa32a

Browse files
funbringerfunbringer
committed
resolve conflicts caused by merge
2 parents b854f3e + c44d6d5 commit 5faa32a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎expected/pathman_bgw.out

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ BEGIN
200200

201201
ASSERT rows IS NOT NULL;
202202

203-
IF rows_old = rows THEN
203+
-- rows should increase!
204+
IF rows_old <= rows THEN
204205
i = i + 1;
205206
END IF;
206207
ELSE

‎sql/pathman_bgw.sql

+2-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ BEGIN
114114

115115
ASSERT rows IS NOT NULL;
116116

117-
IF rows_old = rows THEN
117+
-- rows should increase!
118+
IF rows_old <= rows THEN
118119
i = i + 1;
119120
END IF;
120121
ELSE

0 commit comments

Comments
 (0)