diff --git a/VERSION b/VERSION index 9c204297..810eb860 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.8.2-stable+timestamp.2013.12.09.17.54.55 +Version 2.8.2-stable+timestamp.2013.12.09.18.55.10 diff --git a/gluon/dal.py b/gluon/dal.py index bc1f4ab0..1211e894 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1032,7 +1032,8 @@ class BaseAdapter(ConnectionPool): if self.dbengine == 'mysql': if not hasattr(table, "_primarykey"): fields.append('PRIMARY KEY (%s)' % (self.QUOTE_TEMPLATE % table._id.name)) - other = ' ENGINE=InnoDB CHARACTER SET utf8;' + engine = self.adapter_args.get('engine','InnoDB') + other = ' ENGINE=%s CHARACTER SET utf8;' % engine fields = ',\n '.join(fields) for rtablename in TFK: