From 9b30feda8a89bf5d97837722fc9bb7a729b67f3e Mon Sep 17 00:00:00 2001 From: "Luis A. Garcia" Date: Thu, 6 Mar 2014 13:00:27 -0700 Subject: [PATCH] Set storage engine for the trait_type table Not setting the storage engine for this table can cause problems in those MySQL installations whose default storage engine is not InnoDB. Change-Id: Ifd0ed0ce7698eb840da87e3f393cd223dcfd36e1 Closes-Bug: #1288894 --- .../migrate_repo/versions/023_add_trait_types.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py index c762d4849..a8f7856c2 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py @@ -30,7 +30,9 @@ def upgrade(migrate_engine): Column('id', Integer, primary_key=True), Column('desc', String(255)), Column('data_type', Integer), - UniqueConstraint('desc', 'data_type', name="tt_unique") + UniqueConstraint('desc', 'data_type', name="tt_unique"), + mysql_engine='InnoDB', + mysql_charset='utf8', ) trait = Table('trait', meta, autoload=True) unique_name = Table('unique_name', meta, autoload=True) @@ -90,7 +92,9 @@ def downgrade(migrate_engine): unique_name = Table( 'unique_name', meta, Column('id', Integer, primary_key=True), - Column('key', String(255), unique=True) + Column('key', String(255), unique=True), + mysql_engine='InnoDB', + mysql_charset='utf8', ) trait_type = Table('trait_type', meta, autoload=True)