=== modified file 'lib/mysql/fabric/checkpoint.py' --- lib/mysql/fabric/checkpoint.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/checkpoint.py 2014-10-10 06:50:30 +0000 @@ -82,7 +82,8 @@ "sequence INTEGER NOT NULL, action_fqn TEXT NOT NULL, " "param_args BLOB NULL, param_kwargs BLOB NULL, " "started DOUBLE(16, 6) NULL, finished DOUBLE(16, 6) NULL, " - "CONSTRAINT pk_checkpoint PRIMARY KEY (proc_uuid, job_uuid))" + "CONSTRAINT pk_checkpoint PRIMARY KEY (proc_uuid, job_uuid)) " + "DEFAULT CHARSET=utf8" ) #SQL statement for inserting a new checkpoint into the table. === modified file 'lib/mysql/fabric/error_log.py' --- lib/mysql/fabric/error_log.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/error_log.py 2014-10-10 06:50:30 +0000 @@ -56,7 +56,7 @@ "reporter VARCHAR(64) NOT NULL, " "error TEXT, " "INDEX key_server_uuid_reported (server_uuid, reported), " - "INDEX key_reporter (reporter))" + "INDEX key_reporter (reporter)) DEFAULT CHARSET=utf8" ) #SQL Statement for creating event used to prune error logs that are === modified file 'lib/mysql/fabric/handler.py' --- lib/mysql/fabric/handler.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/handler.py 2014-10-10 06:50:30 +0000 @@ -41,7 +41,7 @@ "INDEX key_reporter (reporter), " "INDEX key_reported (reported), " "INDEX key_category (category), " - "INDEX key_type (type))" + "INDEX key_type (type)) DEFAULT CHARSET=utf8" ) _CREATE_GROUP_VIEW = ( === modified file 'lib/mysql/fabric/machine.py' --- lib/mysql/fabric/machine.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/machine.py 2014-10-11 08:25:29 +0000 @@ -35,10 +35,11 @@ _CREATE_INSTANCE = ( "CREATE TABLE machines " "(machine_uuid VARCHAR(40) NOT NULL, " - "provider_id VARCHAR(256) NOT NULL, " + "provider_id VARCHAR(128) NOT NULL, " "av_zone VARCHAR(256), " "addresses TEXT, " - "INDEX idx_machine_provider_id (provider_id))" + "INDEX idx_machine_provider_id (provider_id)) " + "DEFAULT CHARSET=utf8" ) _ALTER_FOREING_KEY_PROVIDER = ( === modified file 'lib/mysql/fabric/provider.py' --- lib/mysql/fabric/provider.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/provider.py 2014-10-11 08:25:45 +0000 @@ -33,7 +33,7 @@ _CREATE_PROVIDER = ( "CREATE TABLE providers " - "(provider_id VARCHAR(256) NOT NULL, " + "(provider_id VARCHAR(128) NOT NULL, " "type INT NOT NULL, " "username VARCHAR(100) NOT NULL, " "password VARCHAR(128) NOT NULL, " @@ -41,7 +41,8 @@ "tenant VARCHAR(100) NOT NULL, " "default_image VARCHAR(256), " "default_flavor VARCHAR(256), " - "CONSTRAINT pk_provider_id PRIMARY KEY (provider_id))" + "CONSTRAINT pk_provider_id PRIMARY KEY (provider_id)) " + "DEFAULT CHARSET=utf8" ) _QUERY_PROVIDER = ( === modified file 'lib/mysql/fabric/server.py' --- lib/mysql/fabric/server.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/server.py 2014-10-10 06:50:30 +0000 @@ -97,7 +97,9 @@ "master_uuid VARCHAR(40), " "master_defined TIMESTAMP /*!50604 (6) */ NULL, " "status BIT(1) NOT NULL, " - "CONSTRAINT pk_group_id PRIMARY KEY (group_id))") + "CONSTRAINT pk_group_id PRIMARY KEY (group_id)) " + "DEFAULT CHARSET=utf8" + ) #Create the table that stores the group replication relationship. CREATE_GROUP_REPLICATION = ( @@ -110,7 +112,9 @@ "REFERENCES groups(group_id), " "CONSTRAINT FOREIGN KEY(slave_group_id) " "REFERENCES groups(group_id), " - "INDEX idx_slave_group_id(slave_group_id))") + "INDEX idx_slave_group_id(slave_group_id)) " + "DEFAULT CHARSET=utf8" + ) #SQL statement for inserting a new group into the table INSERT_GROUP = ("INSERT INTO groups(group_id, description, status) " @@ -666,7 +670,8 @@ "group_id VARCHAR(64), " "CONSTRAINT pk_server_uuid PRIMARY KEY (server_uuid), " "INDEX idx_group_id (group_id), " - "UNIQUE INDEX idx_server_address (server_address))" + "UNIQUE INDEX idx_server_address (server_address)) " + "DEFAULT CHARSET=utf8" ) #Create the referential integrity constraint with the groups table === modified file 'lib/mysql/fabric/sharding.py' --- lib/mysql/fabric/sharding.py revid:alfranio.correia@oracle.com-20140921222058-htk2xkx524efnype +++ lib/mysql/fabric/sharding.py 2014-10-10 06:50:30 +0000 @@ -82,7 +82,9 @@ "table_name VARCHAR(64) NOT NULL, " "column_name VARCHAR(64) NOT NULL, " "PRIMARY KEY (table_name, column_name), " - "INDEX(shard_mapping_id))") + "INDEX(shard_mapping_id)) " + "DEFAULT CHARSET=utf8" + ) DUMP_SHARD_TABLES = ( "SELECT " @@ -118,7 +120,7 @@ "'RANGE','RANGE_INTEGER','RANGE_STRING','RANGE_DATETIME','HASH'" ") NOT NULL, " "global_group VARCHAR(64)" - ")" + ") DEFAULT CHARSET=utf8" ) DUMP_SHARD_MAPS = ( @@ -627,7 +629,9 @@ CREATE_SHARDS = ("CREATE TABLE shards (" "shard_id INT AUTO_INCREMENT NOT NULL PRIMARY KEY, " "group_id VARCHAR(64) NOT NULL, " - "state ENUM('DISABLED', 'ENABLED') NOT NULL)") + "state ENUM('DISABLED', 'ENABLED') NOT NULL) " + "DEFAULT CHARSET=utf8" + ) #Create the referential integrity constraint with the groups table. ADD_FOREIGN_KEY_CONSTRAINT_GROUP_ID = \ @@ -868,7 +872,9 @@ "lower_bound VARBINARY(16) NOT NULL, " "INDEX(lower_bound), " "UNIQUE(shard_mapping_id, lower_bound), " - "shard_id INT NOT NULL)") + "shard_id INT NOT NULL) " + "DEFAULT CHARSET=utf8" + ) #Create the referential integrity constraint with the shard_mapping_defn #table