Ticket #5284: mythtv-5284-minimum_MySQL_version-20080728.patch

libs/libmythtv/dbcheck.cpp

@@ -14 +14 @@
 #include "libmythdb/mythdb.h"
 
 
-#define MINIMUM_DBMS_VERSION 5
+#define MINIMUM_DBMS_VERSION_MAJOR 5
+#define MINIMUM_DBMS_VERSION_MINOR 0
+#define MINIMUM_DBMS_VERSION_POINT 15
 
 /// This is the DB schema version expected by the running MythTV instance.
 const QString currentDatabaseVersion = "1222";
@@ -531 +533 @@
         DataDirectProcessor::FixProgramIDs();
 
     DBUtil dbutil;
-    int dbmsVersionCheck = dbutil.CompareDBMSVersion(MINIMUM_DBMS_VERSION);
+    int dbmsVersionCheck = dbutil.CompareDBMSVersion(MINIMUM_DBMS_VERSION_MAJOR,
+                      MINIMUM_DBMS_VERSION_MINOR, MINIMUM_DBMS_VERSION_POINT);
     if (dbmsVersionCheck == DBUtil::kUnknownVersionNumber)
     {
         VERBOSE(VB_IMPORTANT, "ERROR: Unable to determine MySQL version.");
@@ -541 +544 @@
     if (dbmsVersionCheck < 0)
     {
         VERBOSE(VB_IMPORTANT, QString("ERROR: This version of MythTV requires "
-                                      "MySQL %1.0 or later.  You seem to be "
-                                      "running MySQL version %2.")
-                                      .arg(MINIMUM_DBMS_VERSION)
+                                      "MySQL %1.%2.%3 or later.  You seem to "
+                                      "be running MySQL version %4.")
+                                      .arg(MINIMUM_DBMS_VERSION_MAJOR)
+                                      .arg(MINIMUM_DBMS_VERSION_MINOR)
+                                      .arg(MINIMUM_DBMS_VERSION_POINT)
                                       .arg(dbutil.GetDBMSVersion()));
         VERBOSE(VB_IMPORTANT, "Your database has not been changed. Please "
                               "upgrade your MySQL server or use an older "