From: mkanat%kerio.com <>
Date: Tue, 12 Jul 2005 05:07:14 +0000 (+0000)
Subject: Bug 204217: require MySQL version 4.0+
X-Git-Tag: bugzilla-2.21.1~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6075db7e7080f8e37b4eba0986fdc462a341735;p=thirdparty%2Fbugzilla.git

Bug 204217: require MySQL version 4.0+
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=joel, a=justdave
---

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 983cb3b06a..77127630cf 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -47,7 +47,7 @@ use Bugzilla::Error;
 # This module extends the DB interface via inheritance
 use base qw(Bugzilla::DB);
 
-use constant REQUIRED_VERSION => '3.23.41';
+use constant REQUIRED_VERSION => '4.0.14';
 use constant PROGRAM_NAME => 'MySQL';
 use constant MODULE_NAME  => 'Mysql';
 use constant DBD_VERSION  => '2.9003';
diff --git a/checksetup.pl b/checksetup.pl
index d0652716f1..c86a2e4272 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1499,12 +1499,6 @@ if ($my_db_check) {
             "   Bugzilla requires version $sql_want or later of $sql_server.\n" . 
             "   Please download and install a newer version.\n";
     }
-    # This message is specific to MySQL.
-    if ($dbh->isa('Bugzilla::DB::Mysql') && ($sql_vers =~ /^4\.0\.(\d+)/) && ($1 < 2)) {
-        die "\nYour MySQL server is incompatible with Bugzilla.\n" .
-            "   Bugzilla does not support versions 4.x.x below 4.0.2.\n" .
-            "   Please visit http://www.mysql.com/ and download a newer version.\n";
-    }
 
     # See if we can connect to the database.
     my $conn_success = eval { 
diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index 686bdb4622..7202405525 100644
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -42,7 +42,7 @@
 <!ENTITY mysql "http://www.mysql.com/">
 
 <!-- For minimum versions -->
-<!ENTITY min-mysql-ver "3.23.41">
+<!ENTITY min-mysql-ver "4.0.14">
 <!ENTITY min-pg-ver "7.3.x">
 <!ENTITY min-perl-ver "5.6.1">
 <!ENTITY min-perl-ver-win "5.8.1">