X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/abcfe83a703476c6fe29ee1ff071f84dac415ab2..0ef723ce97749ca6a6764afd39ba05ca81fb1bc2:/src/plugins/mysql.sml

diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index 3cfa94f..1b4d07a 100644
--- a/src/plugins/mysql.sml
+++ b/src/plugins/mysql.sml
@@ -32,28 +32,31 @@ fun adduser {user, passwd} =
       | SOME passwd =>
 	if validPasswd passwd then
 	    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
-		       (Slave.shellOutput [Config.MySQL.adduser, user, " ", passwd])
+		       (Slave.shellOutput [Config.MySQL.adduser, " ", user, " ", passwd])
 	else
 	    SOME "Password contains characters besides letters, digits, and !.-_"
 
 fun passwd {user, passwd} =
     if validPasswd passwd then
 	Option.map (fn s => "Error executing SET PASSWORD script:\n" ^ s)
-		   (Slave.shellOutput [Config.MySQL.passwd, user, " ", passwd])
+		   (Slave.shellOutput [Config.MySQL.passwd, " ", user, " ", passwd])
     else
 	SOME "Password contains characters besides letters, digits, and !.-_"
 
-fun createdb {user, dbname} =
-    Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
-	       (Slave.shellOutput [Config.MySQL.createdb, user, " ", dbname])
+fun createdb {user, dbname, encoding} =
+    case encoding of
+	SOME _ => SOME "MySQL doesn't support specifying encodings"
+      | NONE =>
+	Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
+		   (Slave.shellOutput [Config.MySQL.createdb, " ", user, " ", dbname])
 
 fun dropdb {user, dbname} =
     Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
-	       (Slave.shellOutput [Config.MySQL.dropdb, user, " ", dbname])
+	       (Slave.shellOutput [Config.MySQL.dropdb, " ", user, " ", dbname])
 
 fun grant {user, dbname} =
     Option.map (fn s => "Error executing GRANT script:\n" ^ s)
-	       (Slave.shellOutput [Config.MySQL.grant, user, " ", dbname])
+	       (Slave.shellOutput [Config.MySQL.grant, " ", user, " ", dbname])
 
 val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
 				 adduser = adduser,