From: Frederic Massart <fred@moodle.com>
Date: Mon, 21 Jul 2014 02:04:12 +0000 (+0800)
Subject: Merge branch 'prefixdbname' of git://github.com/mudrd8mz/mdk
X-Git-Tag: v1.3~23
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=b1fedb1e9cdb439ce37627abf3bf807993d2f9be;p=mdk.git

Merge branch 'prefixdbname' of git://github.com/mudrd8mz/mdk

Conflicts:
	config-dist.json
---

b1fedb1e9cdb439ce37627abf3bf807993d2f9be
diff --cc config-dist.json
index d5092cf,1412ea4..792fd5c
--- a/config-dist.json
+++ b/config-dist.json
@@@ -33,12 -33,8 +33,14 @@@
  
      // Database access
      "db": {
+         // Name prefix for all databases created by mdk. Affects the database name only, not the tables.
+         "namePrefix": "",
 +        "mariadb": {
 +            "host": "localhost",
 +            "port": "3306",
 +            "user": "root",
 +            "passwd": "root"
 +        },
          "mysqli": {
              "host": "localhost",
              "port": "3306",