diff --git a/ChangeLog b/ChangeLog index 0015003c..e1317aca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15225,3 +15225,6 @@ 2016-06-10 Fred Gleason * Fixed a bug in 'lib/rdlist_logs.cpp' that failed to process SQL NULL date values correctly. +2016-06-10 Fred Gleason + * Fixed a bug in 'utils/rdmaint/rdmaint.cpp' that failed to process + SQL NULL date values correctly. diff --git a/utils/rdmaint/rdmaint.cpp b/utils/rdmaint/rdmaint.cpp index 2a1a8aae..1f907a3a 100644 --- a/utils/rdmaint/rdmaint.cpp +++ b/utils/rdmaint/rdmaint.cpp @@ -204,9 +204,10 @@ void MainObject::PurgeLogs() RDSqlQuery *q; QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime()); - sql=QString().sprintf("select NAME from LOGS where \ - (PURGE_DATE!=\"0000-00-00\")&&(PURGE_DATE<\"%s\")", - (const char *)dt.date().toString("yyyy-MM-dd")); + sql=QString("select NAME from LOGS where ")+ + "(PURGE_DATE!=\"0000-00-00\")&&"+ + "(PURGE_DATE is not null)&&"+ + "(PURGE_DATE<\""+dt.date().toString("yyyy-MM-dd")+"\")"; q=new RDSqlQuery(sql); while(q->next()) { maint_config->