From cfb4ad901f1acc08d65f4972393b2308cf509d31 Mon Sep 17 00:00:00 2001
From: Vishant Gautam <gautamvishant@gmail.com>
Date: Mon, 15 Sep 2014 18:04:29 +0200
Subject: Bug 252555: Remove the ANSI mode when running MySQL r=LpSolit
 a=sgreen

---
 Bugzilla/DB/Mysql.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Bugzilla/DB')

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index f03c827b3..02cc8bc10 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -86,17 +86,18 @@ sub new {
     $self->{private_bz_dsn} = $dsn;
 
     bless ($self, $class);
-    
-    # Bug 321645 - disable MySQL strict mode, if set
+
+    # Check for MySQL modes.
     my ($var, $sql_mode) = $self->selectrow_array(
         "SHOW VARIABLES LIKE 'sql\\_mode'");
 
+    # Disable ANSI and strict modes, else Bugzilla will crash.
     if ($sql_mode) {
         # STRICT_TRANS_TABLE or STRICT_ALL_TABLES enable MySQL strict mode,
         # causing bug 321645. TRADITIONAL sets these modes (among others) as
         # well, so it has to be stipped as well
         my $new_sql_mode =
-            join(",", grep {$_ !~ /^STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL$/}
+            join(",", grep {$_ !~ /^(?:ANSI|STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL)$/}
                             split(/,/, $sql_mode));
 
         if ($sql_mode ne $new_sql_mode) {
-- 
cgit v1.2.3-24-g4f1b