You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/01/19 15:39:05 UTC
[4/4] incubator-brooklyn git commit: This closes #1155
This closes #1155
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/717c79b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/717c79b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/717c79b8
Branch: refs/heads/master
Commit: 717c79b8e39ac736925d3dab38e1fe7ca85d66cd
Parents: ae01e5e 12128ff
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jan 19 14:38:48 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Jan 19 14:38:48 2016 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlNode.java | 3 +++
.../org/apache/brooklyn/entity/database/mysql/mysql.conf | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/717c79b8/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
----------------------------------------------------------------------
diff --cc brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
index 1583b73,faabfa3..40b4086
--- a/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
+++ b/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
@@@ -13,11 -13,11 +13,15 @@@ socket = /tmp/mysql.sock.${ent
basedir = ${driver.baseDir}
datadir = ${driver.dataDir}
bind-address = 0.0.0.0
+ log_error = ${driver.runDir}/mysql_error_${entity.getId()}.log
+ log_warnings = 2
+ general_log = ${config["mysql.general_log"]?string('on','off')}
+ general_log_file = ${driver.runDir}/mysql_general_${entity.getId()}.log
# skip-networking
+#Prevent the GRANT statement from automatically creating new user accounts if it would otherwise do so,
+#unless authentication information is specified
+sql_mode = NO_AUTO_CREATE_USER
+
# Custom configuration options
${driver.mySqlServerOptionsString}