Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit5faa32a

Browse files
committed
resolve conflicts caused by merge
2 parentsb854f3e +c44d6d5 commit5faa32a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎expected/pathman_bgw.out

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ BEGIN
114114

115115
ASSERT rowsIS 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)

[8]ページ先頭

©2009-2025 Movatter.jp