summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2011-08-16 03:30:14 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2011-08-16 03:30:14 +0200
commitfe80341cb23b38b519465c648c7bebd95d1f58ce (patch)
treebc1353a6f275a951477ac2e453ee72ef36f45df5 /Bugzilla
parentf5f7226e0ef80d83b1ae385361a5eb4a30bfdaaa (diff)
downloadbugzilla-fe80341cb23b38b519465c648c7bebd95d1f58ce.tar.gz
bugzilla-fe80341cb23b38b519465c648c7bebd95d1f58ce.tar.xz
Bug 654496: Duplicate bug detection doesn't work when using Oracle
r/a=mkanat
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Bug.pm4
-rw-r--r--Bugzilla/DB/Oracle.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index aa4eddd4c..8b322031b 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -559,8 +559,8 @@ sub possible_duplicates {
FROM bugs
INNER JOIN bugs_fulltext ON bugs.bug_id = bugs_fulltext.bug_id
WHERE ($where_sql) $product_sql
- ORDER BY relevance DESC, bug_id DESC
- LIMIT $sql_limit", {Slice=>{}});
+ ORDER BY relevance DESC, bug_id DESC " .
+ $dbh->sql_limit($sql_limit), {Slice=>{}});
my @actual_dupe_ids;
# Resolve duplicates into their ultimate target duplicates.
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index f444129e1..d91eb428e 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -177,7 +177,7 @@ sub sql_fulltext_search {
my ($self, $column, $text, $label) = @_;
$text = $self->quote($text);
trick_taint($text);
- return "CONTAINS($column,$text,$label)", "SCORE($label)";
+ return "CONTAINS($column,$text,$label) > 0", "SCORE($label)";
}
sub sql_date_format {