From 09d2727039b11774f1dbf790ad3ab737c4f7b300 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 23 May 2013 01:03:13 +0800
Subject: Bug 828344: add missing xt broken tests

---
 xt/lib/Bugzilla/Test/Search/Constants.pm | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
index 051570ff8..85547df46 100644
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -263,6 +263,15 @@ use constant KNOWN_BROKEN => {
     'allwords-<1>' => {
         ALLWORDS_BROKEN,
     },
+    'anywords-<1>' => {
+        'flagtypes.name' => { contains => [1,2,3,4,5] },
+    },
+    'anywords-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
+    'anywordssubstr-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
 
     # setters.login_name and requestees.login name aren't tracked individually
     # in bugs_activity, so can't be searched using this method.
@@ -401,12 +410,18 @@ use constant BROKEN_NOT => {
     anyexact => {
         'flagtypes.name' => { contains => [1, 2, 5] },
     },
-    anywords => {
-        'flagtypes.name' => { contains => [1, 2, 5] },
+    'anywords-<1>' => {
+        'flagtypes.name' => { contains => [1, 2, 3, 4, 5] },
+    },
+    'anywords-<1> <2>' => {
+        'flagtypes.name' => { contains => [3, 4, 5] },
     },
     anywordssubstr => {
         'flagtypes.name' => { contains => [5] },
     },
+    'anywordssubstr-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
     casesubstring => {
         'flagtypes.name' => { contains => [5] },
     },
@@ -462,6 +477,12 @@ use constant BROKEN_NOT => {
     notsubstring => {
         longdesc         => { contains => [1] },
     },
+    'nowords-<1>' => {
+        'flagtypes.name' => { contains => [5] },
+    },
+    'nowordssubstr-<1>' => {
+        'flagtypes.name' => { contains => [5] },
+    },
     lessthan => {
         'flagtypes.name' => { contains => [5] },
     },
-- 
cgit v1.2.3-24-g4f1b


From 90e68b0efa74964c57334929008ae5a95c9f5b53 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 22 May 2013 14:46:58 -0400
Subject: Bump  version to 4.2.6

---
 Bugzilla/Constants.pm          | 2 +-
 docs/en/xml/Bugzilla-Guide.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 9219db69e..cd3a24e0b 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -202,7 +202,7 @@ use Memoize;
 # CONSTANTS
 #
 # Bugzilla version
-use constant BUGZILLA_VERSION => "4.2.5+";
+use constant BUGZILLA_VERSION => "4.2.6";
 
 # Location of the remote and local XML files to track new releases.
 use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml';
diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index d2461eda1..045a426ee 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -32,9 +32,9 @@
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "4.2.5">
+<!ENTITY bz-ver "4.2.6">
 <!ENTITY bz-nextver "4.4">
-<!ENTITY bz-date "2013-02-19">
+<!ENTITY bz-date "2013-05-22">
 <!ENTITY current-year "2013">
 
 <!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-4.2-branch/">
-- 
cgit v1.2.3-24-g4f1b


From 6e53f77df7e055797ef587f349e3c35fdd82718c Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 22 May 2013 16:09:47 -0400
Subject: Bump version post-release

---
 Bugzilla/Constants.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index cd3a24e0b..d93e0793d 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -202,7 +202,7 @@ use Memoize;
 # CONSTANTS
 #
 # Bugzilla version
-use constant BUGZILLA_VERSION => "4.2.6";
+use constant BUGZILLA_VERSION => "4.2.6+";
 
 # Location of the remote and local XML files to track new releases.
 use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml';
-- 
cgit v1.2.3-24-g4f1b