diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-15 22:47:54 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-16 08:39:49 +0100 |
| commit | 2153aaf66eeff70b2191806e187c2b845b91f3a2 (patch) | |
| tree | 28d36ccb5f4d2c70859759b41e221a09745024fd /extra/mariabackup/backup_mysql.cc | |
| parent | a8a27e65a8d2f7284b1a4e8c45d0f6759b97a79f (diff) | |
| download | mariadb-git-2153aaf66eeff70b2191806e187c2b845b91f3a2.tar.gz | |
mariabackup : use die() macro for fatal exit with error message.
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 0dbd2425363..8936b577a9e 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -167,9 +167,10 @@ xb_mysql_query(MYSQL *connection, const char *query, bool use_result, MYSQL_RES *mysql_result = NULL; if (mysql_query(connection, query)) { - msg("Error: failed to execute query %s: %s", query, mysql_error(connection)); if (die_on_error) { - exit(EXIT_FAILURE); + die("failed to execute query %s: %s", query, mysql_error(connection)); + } else { + msg("Error: failed to execute query %s: %s", query, mysql_error(connection)); } return(NULL); } @@ -177,9 +178,8 @@ xb_mysql_query(MYSQL *connection, const char *query, bool use_result, /* store result set on client if there is a result */ if (mysql_field_count(connection) > 0) { if ((mysql_result = mysql_store_result(connection)) == NULL) { - msg("Error: failed to fetch query result %s: %s", + die("failed to fetch query result %s: %s", query, mysql_error(connection)); - exit(EXIT_FAILURE); } if (!use_result) { @@ -910,8 +910,7 @@ DECLARE_THREAD(kill_mdl_waiters_thread(void *)) row[1], row[2], row[0]); snprintf(query, sizeof(query), "KILL QUERY %s", row[0]); if (mysql_query(mysql, query) && (mysql_errno(mysql) != ER_NO_SUCH_THREAD)) { - msg("Error: failed to execute query %s: %s", query,mysql_error(mysql)); - exit(EXIT_FAILURE); + die("failed to execute query %s: %s", query,mysql_error(mysql)); } } mysql_free_result(result); |