Apply sql_find fix for sorting NULL LastWritten

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1048 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql_find.c b/bacula/src/cats/sql_find.c
index c7cb8d136950b8b9d414e0e326fd048441c69218..c192b09110e45b8f00bfd8f23cbb5bce2efa9457 100644 (file)
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -226,7 +226,7 @@ db_find_next_volume(JCR *jcr, B_DB *mdb, int item, bool InChanger, MEDIA_DBR *mr
       Mmsg(&mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks,"
           "VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes,"
           "VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,Recycle,Slot,"
-          "FirstWritten,LastWritten,VolStatus "
+          "FirstWritten,IFNULL(LastWritten,0),VolStatus "
           "FROM Media WHERE PoolId=%u AND MediaType='%s' AND VolStatus IN ('Full',"
           "'Recycle','Purged','Used','Append') "
           "ORDER BY LastWritten LIMIT 1", mr->PoolId, mr->MediaType); 

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a9e90ddd16e8636bc47e994d036a26ead8f3a69c..9646139af4a09f46f46faa07ce6ad147586ebe64 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.33.3"
 #define VSTRING "1"
-#define BDATE   "10 Feb 2004"
-#define LSMDATE "10Feb04"
+#define BDATE   "12 Feb 2004"
+#define LSMDATE "12Feb04"
 
 /* Debug flags */
 #undef  DEBUG