Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman 2019-09-05 16:28:25 +03:00
commit 29dd16b333
2 changed files with 3 additions and 1 deletions

View File

@ -97,6 +97,7 @@ Here are detailed documents about the filters MariaDB MaxScale offers. They cont
- [RabbitMQ Filter](Filters/RabbitMQ-Filter.md)
- [Regex Filter](Filters/Regex-Filter.md)
- [Tee Filter](Filters/Tee-Filter.md)
- [Throttle Filter](Filters/Throttle.md)
- [Top N Filter](Filters/Top-N-Filter.md)
- [Transaction Performance Monitoring Filter](Filters/Transaction-Performance-Monitoring-Filter.md)
- [Binlog Filter](Filters/BinlogFilter.md)

View File

@ -1424,7 +1424,8 @@ int Mariadb_nodes::prepare_server(int i)
// Note: These should be done by MDBCI
ssh_node(i, "test -d /etc/apparmor.d/ && "
"ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && "
"sudo service apparmor restart", true);
"sudo service apparmor restart && "
"chmod a+r -R /etc/my.cnf.d/*", true);
int ec;
char* version = ssh_node_output(i, "/usr/sbin/mysqld --version", false, &ec);