Adding in backwards compatability for those who might not have set EX…

…TRA_MY_CNF's correctly

Signed-off-by: Dan Kozlowski <koz@planetscale.com>

.gitignore

@@ -11,6 +11,9 @@
 *.swp
 tags
 
+# emacs
+*~
+
 # Eclipse files
 .classpath
 .project
@@ -72,4 +75,4 @@ releases
 
 
 # Vagrant
-.vagrant
+.vagrant

go/vt/mysqlctl/mysqld.go

@@ -611,6 +611,15 @@ func (mysqld *Mysqld) initConfig(root string, cnf *Mycnf, outFile string) error
 	return ioutil.WriteFile(outFile, []byte(configData), 0664)
 }
 
+func contains(haystack []string, needle string) bool {
+	for _, v := range haystack {
+		if v == needle {
+			return true
+		}
+	}
+	return false
+}
+
 func getMycnfTemplates(root string) []string {
 	if *mycnfTemplateFile != "" {
 		return []string{*mycnfTemplateFile}
@@ -627,6 +636,25 @@ func getMycnfTemplates(root string) []string {
 		cnfTemplatePaths = append(cnfTemplatePaths, parts...)
 	}
 
+	switch mysqlFlavor := os.Getenv("MYSQL_FLAVOR"); mysqlFlavor {
+	case "MariaDB":
+		path := "config/mycnf/master_mariadb.cnf"
+		if !contains(cnfTemplatePaths, path) {
+			cnfTemplatePaths = append(cnfTemplatePaths, "config/mycnf/master_mariadb.cnf")
+		}
+	case "MariaDB103":
+		path := "config/mycnf/master_mariadb103.cnf"
+		if !contains(cnfTemplatePaths, path) {
+			cnfTemplatePaths = append(cnfTemplatePaths, "config/mycnf/master_mariadb103.cnf")
+		}
+	default:
+		path := "config/mycnf/master_mysql56.cnf"
+		// By default we assume Mysql56 compatable
+		if !contains(cnfTemplatePaths, path) {
+			cnfTemplatePaths = append(cnfTemplatePaths, "config/mycnf/master_mysql56.cnf")
+		}
+	}
+
 	return cnfTemplatePaths
 }