diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-20 18:20:31 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-20 18:20:31 +0400 |
commit | 072ca71d26487817d025ee97955e6360c3c5c086 (patch) | |
tree | fbf90bde96cca7b2270317b7c7086b50c979b526 /plugin/handler_socket/client | |
parent | f8adeccd78bff80725a95b73447e34a5f4528179 (diff) | |
download | mariadb-git-072ca71d26487817d025ee97955e6360c3c5c086.tar.gz |
MDEV-9281 - Debian: the Lintian complains about "shlib-calls-exit" in handlersocket.so
MDEV-9278 - Debian: the Lintian complains about "shlib-calls-exit" in ha_spider.so
Handlersocket handles errors in a way that it aborts program execution. In most
cases it is done via abort(). One exception was host/service resolution failure,
which was aborted with exit().
As a workaround replaced this exit() with abort() for symmetry with other error
handling.
Diffstat (limited to 'plugin/handler_socket/client')
-rw-r--r-- | plugin/handler_socket/client/hslongrun.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/handler_socket/client/hslongrun.cpp b/plugin/handler_socket/client/hslongrun.cpp index e82c12b166b..b7c02951340 100644 --- a/plugin/handler_socket/client/hslongrun.cpp +++ b/plugin/handler_socket/client/hslongrun.cpp @@ -39,7 +39,7 @@ struct auto_mysql : private noncopyable { mysql_close(db); } if ((db = mysql_init(0)) == 0) { - fatal_exit("failed to initialize mysql client"); + fatal_abort("failed to initialize mysql client"); } } operator MYSQL *() const { return db; } @@ -870,7 +870,7 @@ mysql_do(MYSQL *db, const char *query) { if (mysql_real_query(db, query, strlen(query)) != 0) { fprintf(stderr, "mysql: e=[%s] q=[%s]\n", mysql_error(db), query); - fatal_exit("mysql_do"); + fatal_abort("mysql_do"); } } @@ -886,7 +886,7 @@ hs_longrun_init_table(const config& conf, int num_prepare, if (!mysql_real_connect(db, mysql_host.c_str(), mysql_user.c_str(), mysql_passwd.c_str(), mysql_dbname.c_str(), mysql_port, 0, 0)) { fprintf(stderr, "mysql: error=[%s]\n", mysql_error(db)); - fatal_exit("hs_longrun_init_table"); + fatal_abort("hs_longrun_init_table"); } mysql_do(db, "drop database if exists hstestdb"); mysql_do(db, "create database hstestdb"); |