X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1b1021cb38f85f638ec5b2141075e99c7b5f0fdd..fe789bea628b15229156c8a4272c2b6063c9b1a0:/src/plugins/mysql.sml diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml index 3cfa94f..a10fbbc 100644 --- a/src/plugins/mysql.sml +++ b/src/plugins/mysql.sml @@ -43,9 +43,12 @@ fun 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)