This was used to avoid an extra " " in the shell command in SML. I
think that's just asking for subtle bugs.
structure MySQL :> MYSQL_CONFIG = struct
structure MySQL :> MYSQL_CONFIG = struct
-val adduser = "/usr/bin/sudo /usr/local/sbin/domtool-mysql adduser "
-val passwd = "/usr/bin/sudo /usr/local/sbin/domtool-mysql passwd "
-val createdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql createdb "
-val dropdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql dropdb "
-val grant = "/usr/bin/sudo /usr/local/sbin/domtool-mysql grant "
+val adduser = "/usr/bin/sudo /usr/local/sbin/domtool-mysql adduser"
+val passwd = "/usr/bin/sudo /usr/local/sbin/domtool-mysql passwd"
+val createdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql createdb"
+val dropdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql dropdb"
+val grant = "/usr/bin/sudo /usr/local/sbin/domtool-mysql grant"
| SOME passwd =>
if validPasswd passwd then
Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
| 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)
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 !.-_"
else
SOME "Password contains characters besides letters, digits, and !.-_"
SOME _ => SOME "MySQL doesn't support specifying encodings"
| NONE =>
Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
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])
+ (Slave.shellOutput [Config.MySQL.createdb, " ", user, " ", dbname])
fun dropdb {user, dbname} =
Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
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)
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,
val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
adduser = adduser,