diff --git a/mxq_daemon.c b/mxq_daemon.c
index d0236887..66e7d320 100644
--- a/mxq_daemon.c
+++ b/mxq_daemon.c
@@ -103,9 +103,9 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon)
                 " prerequisites = ?"
                 );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
-        return -errno;
+        return -EINVAL;
     }
 
     idx  = 0;
@@ -134,7 +134,7 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon)
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -178,7 +178,7 @@ int mxq_daemon_shutdown(struct mx_mysql *mysql, struct mxq_daemon *daemon)
 
     res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -221,7 +221,7 @@ int mxq_daemon_mark_crashed(struct mx_mysql *mysql, struct mxq_daemon *daemon)
 
     res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -260,7 +260,7 @@ int mxq_daemon_set_status(struct mx_mysql *mysql, struct mxq_daemon *daemon, uin
 
     res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -305,7 +305,7 @@ int mxq_daemon_update_statistics(struct mx_mysql *mysql, struct mxq_daemon *daem
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
diff --git a/mxq_group.c b/mxq_group.c
index a354f424..d6527ecb 100644
--- a/mxq_group.c
+++ b/mxq_group.c
@@ -192,7 +192,7 @@ int mxq_load_group(struct mx_mysql *mysql, struct mxq_group **mxq_groups, uint64
 
     res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -222,7 +222,7 @@ int mxq_load_all_groups(struct mx_mysql *mysql, struct mxq_group **mxq_groups)
 
     res = mx_mysql_do_statement(mysql, query, NULL, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -259,7 +259,7 @@ int mxq_load_all_groups_for_user(struct mx_mysql *mysql, struct mxq_group **mxq_
 
     res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -298,7 +298,7 @@ int mxq_load_active_groups_for_user(struct mx_mysql *mysql, struct mxq_group **m
 
     res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -329,7 +329,7 @@ int mxq_load_running_groups(struct mx_mysql *mysql, struct mxq_group **mxq_group
 
     res = mx_mysql_do_statement(mysql, query, NULL, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -367,7 +367,7 @@ int mxq_load_running_groups_for_user(struct mx_mysql *mysql, struct mxq_group **
 
     res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
diff --git a/mxq_job.c b/mxq_job.c
index ba8a606a..44437a38 100644
--- a/mxq_job.c
+++ b/mxq_job.c
@@ -169,7 +169,7 @@ static int do_jobs_statement(struct mx_mysql *mysql, char *query, struct mx_mysq
 
     res = mx_mysql_do_statement(mysql, query, param, &result, &j, (void **)jobs, sizeof(**jobs));
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
     for (i=0;i<res;i++)
@@ -372,7 +372,7 @@ static int mxq_assign_job_from_group_to_daemon(struct mx_mysql *mysql, uint64_t
 
     res = mx_mysql_do_statement_noresult(mysql, query, &param);
     if (res < 0)
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
 
     return res;
 }
@@ -416,7 +416,7 @@ int mxq_unassign_jobs_of_server(struct mx_mysql *mysql, struct mxq_daemon *daemo
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -459,7 +459,7 @@ static int mxq_set_job_status_loaded_on_server(struct mx_mysql *mysql, struct mx
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -516,7 +516,7 @@ int mxq_set_job_status_running(struct mx_mysql *mysql, struct mxq_job *job)
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -608,7 +608,7 @@ int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job)
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -640,7 +640,7 @@ int mxq_set_job_status_unknown(struct mx_mysql *mysql, struct mxq_job *job)
 
     res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
 
@@ -728,7 +728,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j
         res = mxq_load_job_from_group_assigned_to_daemon(mysql, &jobs_tmp, group_id, daemon);
 
         if(res < 0) {
-            mx_log_err("  group_id=%lu :: mxq_load_job_from_group_assigned_to_daemon: %m", group_id);
             return 0;
         }
         if(res == 1) {
@@ -739,7 +738,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j
 
         res = mxq_assign_job_from_group_to_daemon(mysql, group_id, daemon, slots_per_job);
         if (res < 0) {
-            mx_log_err("  group_id=%lu :: mxq_assign_job_from_group_to_daemon(): %m", group_id);
             return 0;
         }
         if (res == 0) {
@@ -750,7 +748,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j
 
     res = mxq_set_job_status_loaded_on_server(mysql, job);
     if (res < 0) {
-        mx_log_err("  group_id=%lu job_id=%lu :: mxq_set_job_status_loaded_on_server(): %m", group_id, job->job_id);
         return 0;
     }
     if (res == 0) {
@@ -837,7 +834,7 @@ int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_id) {
 
     res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
     if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
+        mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
         return res;
     }
     return res;
diff --git a/mxqadmin.c b/mxqadmin.c
index 713f209f..ac3817a2 100644
--- a/mxqadmin.c
+++ b/mxqadmin.c
@@ -89,7 +89,7 @@ static int update_group_flags_closed(struct mx_mysql *mysql, uint64_t group_id,
                 " AND user_uid = ?"
             );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -(errno=EIO);
     }
 
@@ -101,7 +101,7 @@ static int update_group_flags_closed(struct mx_mysql *mysql, uint64_t group_id,
     res = mx_mysql_statement_execute(stmt, &num_rows);
 
     if (res < 0)
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
 
     mx_mysql_statement_close(&stmt);
 
@@ -128,7 +128,7 @@ static int update_group_flags_reopen(struct mx_mysql *mysql, uint64_t group_id,
                 " AND user_uid = ?"
             );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -(errno=EIO);
     }
 
@@ -140,7 +140,7 @@ static int update_group_flags_reopen(struct mx_mysql *mysql, uint64_t group_id,
     res = mx_mysql_statement_execute(stmt, &num_rows);
 
     if (res < 0)
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
 
     mx_mysql_statement_close(&stmt);
 
@@ -164,7 +164,7 @@ int _close_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t us
     }
 
     if (res < 0) {
-        mx_log_err("closing group failed: %m");
+        mx_log_err("closing group failed");
         return res;
     }
 
@@ -187,7 +187,7 @@ int _reopen_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t u
     }
 
     if (res < 0) {
-        mx_log_err("opening group failed: %m");
+        mx_log_err("opening group failed");
         return res;
     }
 
diff --git a/mxqkill.c b/mxqkill.c
index af4b602b..90077e13 100644
--- a/mxqkill.c
+++ b/mxqkill.c
@@ -90,7 +90,7 @@ static int update_group_status_cancelled(struct mx_mysql *mysql, struct mxq_grou
                 " AND group_jobs-group_jobs_finished-group_jobs_failed-group_jobs_cancelled-group_jobs_unknown > 0"
             );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -(errno=EIO);
     }
 
@@ -101,7 +101,7 @@ static int update_group_status_cancelled(struct mx_mysql *mysql, struct mxq_grou
     res = mx_mysql_statement_execute(stmt, &num_rows);
 
     if (res < 0)
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
 
     mx_mysql_statement_close(&stmt);
 
@@ -130,7 +130,7 @@ static int update_job_status_cancelled_by_group(struct mx_mysql *mysql, struct m
                 " AND host_pid = 0"
             );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -(errno=EIO);
     }
 
@@ -140,7 +140,7 @@ static int update_job_status_cancelled_by_group(struct mx_mysql *mysql, struct m
     res = mx_mysql_statement_execute(stmt, &num_rows);
 
     if (res < 0)
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
 
     mx_mysql_statement_close(&stmt);
 
@@ -473,7 +473,7 @@ int main(int argc, char *argv[])
                 mx_log_warning("no active group with group_id=%lu found for user=%s(%d)",
                         group.group_id, group.user_name, group.user_uid);
             else
-                mx_log_err("cancelling group failed: %m");
+                mx_log_err("cancelling group failed");
             return 1;
         }
 
@@ -497,7 +497,7 @@ int main(int argc, char *argv[])
                     group.group_id);
             return 0;
         } else {
-            mx_log_err("cancelling jobs failed: %m");
+            mx_log_err("cancelling jobs failed");
             return 1;
         }
     }
diff --git a/mxqset.c b/mxqset.c
index 126471f6..bf205385 100644
--- a/mxqset.c
+++ b/mxqset.c
@@ -28,15 +28,15 @@ static void verify_group_permission(struct mx_mysql *mysql , long unsigned group
 
     stmt = mx_mysql_statement_prepare(mysql,"SELECT user_uid FROM mxq_group WHERE group_id = ? LIMIT 1");
     if (!stmt)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     mx_mysql_statement_param_bind(stmt, 0, uint64, &(groupid));
     if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     if (num_rows < 1)
         die("no such group %ld\n", groupid);
     mx_mysql_statement_result_bind(stmt, 0, uint32, &uid);
     if (mx_mysql_statement_fetch(stmt) < 0)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     if ( client_uid != 0 && client_uid != uid )
         die("no permission to access this group\n");
     mx_mysql_statement_close(&stmt);
@@ -59,12 +59,12 @@ static void update_closed_flag(struct mx_mysql *mysql, long unsigned groupid, en
     stmt = mx_mysql_statement_prepare(mysql,
             "UPDATE mxq_group SET group_flags = ( group_flags & ?) | ? WHERE group_id = ?");
     if (!stmt)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     mx_mysql_statement_param_bind(stmt, 0, uint64, &(mask));
     mx_mysql_statement_param_bind(stmt, 1, uint64, &(value));
     mx_mysql_statement_param_bind(stmt, 2, uint64, &(groupid));
     if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     if (num_rows < 1)
         die("no such group %ld\n", groupid);
     mx_mysql_statement_close(&stmt);
@@ -81,15 +81,15 @@ static void update_blacklist(struct mx_mysql *mysql, long unsigned groupid, char
         stmt = mx_mysql_statement_prepare(mysql,
              "SELECT group_blacklist FROM mxq_group WHERE group_id = ? LIMIT 1");
         if (!stmt)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         mx_mysql_statement_param_bind(stmt, 0, uint64, &groupid);
         if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         if (num_rows < 1)
             die("no such group %ld\n", groupid);
         mx_mysql_statement_result_bind(stmt, 0, string, &group_blacklist);
         if (mx_mysql_statement_fetch(stmt) < 0)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         blacklist = keywordset_new(group_blacklist);
         free(group_blacklist);
@@ -103,11 +103,11 @@ static void update_blacklist(struct mx_mysql *mysql, long unsigned groupid, char
     stmt = mx_mysql_statement_prepare(mysql,
             "UPDATE mxq_group SET group_blacklist = ? WHERE group_id = ?");
      if (!stmt)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     mx_mysql_statement_param_bind(stmt, 0, string, &group_blacklist);
     mx_mysql_statement_param_bind(stmt, 1, uint64, &groupid);
     if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     if (num_rows < 1)
         die("no such group %ld\n", groupid);
     mx_mysql_statement_close(&stmt);
@@ -126,15 +126,15 @@ static void update_whitelist(struct mx_mysql *mysql, long unsigned groupid, char
         stmt = mx_mysql_statement_prepare(mysql,
                 "SELECT group_whitelist FROM mxq_group WHERE group_id = ? LIMIT 1");
         if (!stmt)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         mx_mysql_statement_param_bind(stmt, 0, uint64, &groupid);
         if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         if (num_rows < 1)
             die("no such group %ld\n", groupid);
         mx_mysql_statement_result_bind(stmt, 0, string, &group_whitelist);
         if (mx_mysql_statement_fetch(stmt) < 0)
-            die("%m\n");
+            die("%s\n", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         whitelist = keywordset_new(group_whitelist);
         free(group_whitelist);
@@ -148,11 +148,11 @@ static void update_whitelist(struct mx_mysql *mysql, long unsigned groupid, char
     stmt = mx_mysql_statement_prepare(mysql,
             "UPDATE mxq_group SET group_whitelist = ? WHERE group_id = ?");
      if (!stmt)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     mx_mysql_statement_param_bind(stmt, 0, string, &group_whitelist);
     mx_mysql_statement_param_bind(stmt, 1, uint64, &groupid);
     if (mx_mysql_statement_execute(stmt, &num_rows) < 0)
-        die("%m\n");
+        die("%s\n", mx_mysql_error());
     if (num_rows < 1)
         die("no such group %ld\n", groupid);
     mx_mysql_statement_close(&stmt);
diff --git a/mxqsub.c b/mxqsub.c
index a23383be..526a5d47 100644
--- a/mxqsub.c
+++ b/mxqsub.c
@@ -179,7 +179,7 @@ static int load_group_id(struct mx_mysql *mysql, struct mxq_group *g)
             " ORDER BY group_id DESC"
             " LIMIT 1");
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -errno;
     }
 
@@ -205,7 +205,7 @@ static int load_group_id(struct mx_mysql *mysql, struct mxq_group *g)
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -217,7 +217,7 @@ static int load_group_id(struct mx_mysql *mysql, struct mxq_group *g)
 
         res = mx_mysql_statement_fetch(stmt);
         if (res < 0) {
-            mx_log_err("mx_mysql_statement_fetch(): %m");
+            mx_log_err("mx_mysql_statement_fetch(): %s", mx_mysql_error());
             mx_mysql_statement_close(&stmt);
             return res;
         }
@@ -275,7 +275,7 @@ static int load_group_id_by_group_id(struct mx_mysql *mysql, struct mxq_group *g
             " ORDER BY group_id DESC"
             " LIMIT 1");
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -errno;
     }
 
@@ -302,7 +302,7 @@ static int load_group_id_by_group_id(struct mx_mysql *mysql, struct mxq_group *g
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -368,7 +368,7 @@ static int load_group_id_run_or_wait(struct mx_mysql *mysql, struct mxq_group *g
             " ORDER BY group_id DESC"
             " LIMIT 1");
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -errno;
     }
 
@@ -394,7 +394,7 @@ static int load_group_id_run_or_wait(struct mx_mysql *mysql, struct mxq_group *g
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -405,7 +405,7 @@ static int load_group_id_run_or_wait(struct mx_mysql *mysql, struct mxq_group *g
 
         res = mx_mysql_statement_fetch(stmt);
         if (res < 0) {
-            mx_log_err("mx_mysql_statement_fetch(): %m");
+            mx_log_err("mx_mysql_statement_fetch(): %s", mx_mysql_error());
             mx_mysql_statement_close(&stmt);
             return res;
         }
@@ -453,7 +453,7 @@ static int add_group(struct mx_mysql *mysql, struct mxq_group *g)
                 " prerequisites = ?,"
                 " tags = ?");
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -errno;
     }
 
@@ -478,7 +478,7 @@ static int add_group(struct mx_mysql *mysql, struct mxq_group *g)
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -530,7 +530,7 @@ static int add_job(struct mx_mysql *mysql, struct mxq_job *j)
                 " job_flags = ?"
                 );
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return -errno;
     }
@@ -549,7 +549,7 @@ static int add_job(struct mx_mysql *mysql, struct mxq_job *j)
 
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -579,13 +579,13 @@ static int get_active_groups_for_user(struct mx_mysql *mysql, char *username)
             " WHERE user_name = ?"
               " AND (group_jobs_inq > 0 OR group_jobs_running > 0)");
     if (!stmt) {
-        mx_log_err("mx_mysql_statement_prepare(): %m");
+        mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
         return -errno;
     }
     mx_mysql_statement_param_bind(stmt, 0, string, &username);
     res = mx_mysql_statement_execute(stmt, &num_rows);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_execute(): %m");
+        mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -593,7 +593,7 @@ static int get_active_groups_for_user(struct mx_mysql *mysql, char *username)
     mx_mysql_statement_result_bind(stmt, 0, uint64, &count);
     res = mx_mysql_statement_fetch(stmt);
     if (res < 0) {
-        mx_log_err("mx_mysql_statement_fetch(): %m");
+        mx_log_err("mx_mysql_statement_fetch(): %s", mx_mysql_error());
         mx_mysql_statement_close(&stmt);
         return res;
     }
@@ -1193,7 +1193,7 @@ int main(int argc, char *argv[])
 
     if (res < 0) {
         if (res != -ENOENT && res != -EDQUOT)
-            mx_log_err("Job submission failed: %m");
+            mx_log_err("Job submission failed.");
         return 1;
     }
 
diff --git a/test_mx_mysql.c b/test_mx_mysql.c
index 3d1d0c9f..03a4714c 100644
--- a/test_mx_mysql.c
+++ b/test_mx_mysql.c
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     res = mx_mysql_statement_fetch(stmt);
     assert(res == 0);
 
-    mx_log_debug("mx_mysql_statement_fetch(): %m");
+    mx_log_debug("mx_mysql_statement_fetch(): %s", mx_mysql_error());
 
 
     mx_log_debug("&group_name = 0x%x", &group_name);