Browse Source

[core] Revert setting MySQL default engine to InnoDB

Reverts HUE-2466 to avoid potential scenario of mixed table types
Jenny Kim 9 years ago
parent
commit
fe14606

+ 0 - 1
desktop/conf.dist/hue.ini

@@ -461,7 +461,6 @@
     # postgresql_psycopg2, mysql, sqlite3 or oracle.
     #
     # Note that for sqlite3, 'name', below is a path to the filename. For other backends, it is the database name
-    # Note that for MySQL, the default storage engine will be set to InnoDB
     # Note for Oracle, options={"threaded":true} must be set in order to avoid crashes.
     # Note for Oracle, you can use the Oracle Service Name by setting "port=0" and then "name=<host>:<port>/<service_name>".
     # Note for MariaDB use the 'mysql' engine.

+ 0 - 1
desktop/conf/pseudo-distributed.ini.tmpl

@@ -465,7 +465,6 @@
     # postgresql_psycopg2, mysql, sqlite3 or oracle.
     #
     # Note that for sqlite3, 'name', below is a path to the filename. For other backends, it is the database name.
-    # Note that for MySQL, the default storage engine will be set to InnoDB
     # Note for Oracle, options={"threaded":true} must be set in order to avoid crashes.
     # Note for Oracle, you can use the Oracle Service Name by setting "port=0" and then "name=<host>:<port>/<service_name>".
     # Note for MariaDB use the 'mysql' engine.

+ 0 - 6
desktop/core/src/desktop/settings.py

@@ -318,12 +318,6 @@ else:
     "ATOMIC_REQUESTS" : True,
   }
 
-# If database engine is MySQL, set to InnoDB
-if default_db['ENGINE'] == 'django.db.backends.mysql':
-  if not 'OPTIONS' in default_db or default_db['OPTIONS'] is None:
-    default_db['OPTIONS'] = dict()
-  default_db['OPTIONS'].update({'init_command': 'SET storage_engine=INNODB'})
-
 DATABASES = {
   'default': default_db
 }