--- bacula-7.4.0/src/cats/sql_cmds.c	2016-01-15 14:57:18.000000000 -0200
+++ /tmp/sql_cmds.c	2016-02-14 07:04:56.511649600 -0200
@@ -109,7 +109,7 @@
    "AND Type='B' ORDER BY StartTime DESC LIMIT 20";
 
 const char *uar_print_jobs = 
-   "SELECT DISTINCT JobId,Level,JobFiles,JobBytes,StartTime,VolumeName"
+   "SELECT DISTINCT JobId,Level,JobFiles,convert_bytes_to_humanreadable(JobBytes) AS JobBytes,StartTime,VolumeName"
    " FROM Job JOIN JobMedia USING (JobId) JOIN Media USING (MediaId) "
    " WHERE JobId IN (%s) "
    " ORDER BY StartTime ASC";
@@ -550,7 +550,7 @@
    /* MySQL */
    "SELECT Job.JobId as JobId,"
    "CONCAT(Path.Path,Filename.Name) as Name, "
-   "StartTime,Type as JobType,JobStatus,JobFiles,JobBytes "
+   "StartTime,Type as JobType,JobStatus,JobFiles,convert_bytes_to_humanreadable(JobBytes) AS JobBytes "
    "FROM Client,Job,File,Filename,Path WHERE Client.Name='%s' "
    "AND Client.ClientId=Job.ClientId "
    "AND Job.JobId=File.JobId AND File.FileIndex > 0 "
@@ -1016,7 +1016,10 @@
 
 const char *expires_in[] = {
    /* MySQL */
-   "(GREATEST(0, CAST(UNIX_TIMESTAMP(LastWritten) + VolRetention AS SIGNED) - UNIX_TIMESTAMP(NOW())))",
+   //"(GREATEST(0, CAST(UNIX_TIMESTAMP(LastWritten) + VolRetention AS SIGNED) - UNIX_TIMESTAMP(NOW())))",
+   "(CASE WHEN UNIX_TIMESTAMP(LastWritten) = 0 THEN 0 "
+   "ELSE (FROM_UNIXTIME( GREATEST(0, CAST(UNIX_TIMESTAMP(NOW() ) + UNIX_TIMESTAMP(LastWritten) + VolRetention AS SIGNED) - UNIX_TIMESTAMP(NOW() ) ),"
+   " '%Y-%m-%d %H:%i:%s')) END)",
    /* PostgreSQL */
    "GREATEST(0, (extract('epoch' from LastWritten + VolRetention * interval '1second' - NOW())::bigint))",
    /* SQLite */