-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* default mariadb plugins directory is configurable and set by default according to the os * no lib mariadb static link REFS: MON-120715
- Loading branch information
1 parent
dc90889
commit c4620dc
Showing
21 changed files
with
71 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,8 @@ | |
* limitations under the License. | ||
* | ||
* For more information : [email protected] | ||
*/ | ||
*/ | ||
|
||
#include <errmsg.h> | ||
|
||
#include "com/centreon/broker/config/applier/init.hh" | ||
|
@@ -190,6 +191,9 @@ bool mysql_connection::_try_to_reconnect() { | |
uint32_t timeout = 10; | ||
mysql_options(_conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout); | ||
|
||
mysql_optionsv(_conn, MYSQL_PLUGIN_DIR, | ||
(const void*)_extension_directory.c_str()); | ||
|
||
if (!mysql_real_connect(_conn, _host.c_str(), _user.c_str(), _pwd.c_str(), | ||
_name.c_str(), _port, | ||
(_socket == "" ? nullptr : _socket.c_str()), | ||
|
@@ -837,6 +841,9 @@ void mysql_connection::_run() { | |
uint32_t timeout = 10; | ||
mysql_options(_conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout); | ||
|
||
mysql_optionsv(_conn, MYSQL_PLUGIN_DIR, | ||
(const void*)_extension_directory.c_str()); | ||
|
||
while (config::applier::mode != config::applier::finished && | ||
!mysql_real_connect(_conn, _host.c_str(), _user.c_str(), | ||
_pwd.c_str(), _name.c_str(), _port, | ||
|
@@ -1081,6 +1088,7 @@ mysql_connection::mysql_connection(const database_config& db_cfg, | |
_pwd(db_cfg.get_password()), | ||
_name(db_cfg.get_name()), | ||
_port(db_cfg.get_port()), | ||
_extension_directory(db_cfg.get_extension_directory()), | ||
_max_second_commit_delay(db_cfg.get_max_commit_delay()), | ||
_last_commit(db_cfg.get_queries_per_transaction() > 1 | ||
? 0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c4620dc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Robot Results
Failed Tests
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Boolean Rules
Boolean Rules
Boolean Rules
Boolean Rules
Boolean Rules
Inherited Downtime
Inherited Downtime
Inherited Downtime
Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bench
Bench
Bench
Bench
Bench
Bench
Bench
Compression
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Lua-Cache
Lua-Cache
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Reverse-Connection
Reverse-Connection
Reverse-Connection
Reverse-Connection
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Scheduler
Servicegroups
Servicegroups
Servicegroups
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-Increased
Services-Increased
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Services
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Migration
Severities
Severities
Severities
Severities
Severities
Severities
Severities
c4620dc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Robot Results
Failed Tests
Inherited Downtime
Inherited Downtime
Inherited Downtime
Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Compression
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Reverse-Connection
Reverse-Connection
Reverse-Connection
Reverse-Connection
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Scheduler
Servicegroups
Servicegroups
Servicegroups
Services-Increased
Services-Increased
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Severities
Severities
Severities
Severities
Severities
Severities
Severities
c4620dc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Robot Results
Failed Tests
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Bam Pb
Boolean Rules
Boolean Rules
Boolean Rules
Boolean Rules
Boolean Rules
Inherited Downtime
Inherited Downtime
Inherited Downtime
Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Pb Inherited Downtime
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Acknowledgement
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Anomaly-Detection
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bbdo-Protobuf
Bench
Bench
Bench
Bench
Bench
Bench
Bench
Compression
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Delete-Poller
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
Downtimes
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
External-Commands2
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hostgroups
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Hosts-With-Notes-And-Actions
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Log-V2 Engine
Lua-Cache
Lua-Cache
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Muxer Filter
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Notifications
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Output-Tables
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Retention-Duplicates
Reverse-Connection
Reverse-Connection
Reverse-Connection
Reverse-Connection
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd-From-Db
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrd
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached-From-Db
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Rrdcached
Scheduler
Servicegroups
Servicegroups
Servicegroups
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-And-Bulk-Stmt
Services-Increased
Services-Increased
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Services-With-Notes-And-Actions
Services
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Start-Stop
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tags
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Tls
Migration
Severities
Severities
Severities
Severities
Severities
Severities
Severities