Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:csbuild:DBA
dba-net-snmp-573-static
net-snmp-5.7.3-snmptrapd_sql.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File net-snmp-5.7.3-snmptrapd_sql.patch of Package dba-net-snmp-573-static
--- a/apps/snmptrapd_sql.c 2014-12-08 21:23:22.000000000 +0100 +++ b/apps/snmptrapd_sql.c 2020-02-27 10:21:10.664924252 +0100 @@ -50,10 +50,9 @@ #undef PACKAGE_STRING #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include <my_global.h> -#include <my_sys.h> #include <mysql.h> #include <errmsg.h> +#include <mysql_version.h> netsnmp_feature_require(container_fifo) @@ -437,6 +436,7 @@ return -1; } +#if MYSQL_VERSION_ID < 100000 #ifdef HAVE_BROKEN_LIBMYSQLCLIENT my_init(); #else @@ -445,6 +445,7 @@ /** load .my.cnf values */ load_defaults ("my", _sql.groups, ¬_argc, ¬_argv); +#endif for(i=0; i < not_argc; ++i) { if (NULL == not_argv[i]) continue; @@ -542,6 +543,10 @@ return -1; } +#if MYSQL_VERSION_ID > 100000 + mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd"); +#endif + /** try to connect; we'll try again later if we fail */ (void) netsnmp_mysql_connect();
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor