Ticket #5284: mythtv-5284-minimum_MySQL_version.patch
File mythtv-5284-minimum_MySQL_version.patch, 1.9 KB (added by , 16 years ago) |
---|
-
libs/libmythtv/dbcheck.cpp
13 13 #include "dbutil.h" 14 14 #include "videodisplayprofile.h" // for "1214" 15 15 16 #define MINIMUM_DBMS_VERSION 5 16 #define MINIMUM_DBMS_VERSION_MAJOR 5 17 #define MINIMUM_DBMS_VERSION_MINOR 0 18 #define MINIMUM_DBMS_VERSION_POINT 15 17 19 18 20 /// This is the DB schema version expected by the running MythTV instance. 19 21 const QString currentDatabaseVersion = "1220"; … … 530 532 DataDirectProcessor::FixProgramIDs(); 531 533 532 534 DBUtil dbutil; 533 int dbmsVersionCheck = dbutil.CompareDBMSVersion(MINIMUM_DBMS_VERSION); 535 int dbmsVersionCheck = dbutil.CompareDBMSVersion(MINIMUM_DBMS_VERSION_MAJOR, 536 MINIMUM_DBMS_VERSION_MINOR, MINIMUM_DBMS_VERSION_POINT); 534 537 if (dbmsVersionCheck == DBUtil::kUnknownVersionNumber) 535 538 { 536 539 VERBOSE(VB_IMPORTANT, "ERROR: Unable to determine MySQL version."); … … 540 543 if (dbmsVersionCheck < 0) 541 544 { 542 545 VERBOSE(VB_IMPORTANT, QString("ERROR: This version of MythTV requires " 543 "MySQL %1.0 or later. You seem to be " 544 "running MySQL version %2.") 545 .arg(MINIMUM_DBMS_VERSION) 546 "MySQL %1.%2.%3 or later. You seem to " 547 "be running MySQL version %4.") 548 .arg(MINIMUM_DBMS_VERSION_MAJOR) 549 .arg(MINIMUM_DBMS_VERSION_MINOR) 550 .arg(MINIMUM_DBMS_VERSION_POINT) 546 551 .arg(dbutil.GetDBMSVersion())); 547 552 VERBOSE(VB_IMPORTANT, "Your database has not been changed. Please " 548 553 "upgrade your MySQL server or use an older "