From 096b159c23a81dac37c73de9e373dadf9e59d78d Mon Sep 17 00:00:00 2001 From: Chico Venancio Date: Fri, 30 Aug 2019 13:00:56 -0300 Subject: [PATCH] ORM: allow MySQL variables to not exist In current versions of MySQL and MariaDB `innodb_file_format` and `innodb_large_prefix` have been removed. This allows them to not exist and makes sure the format for the rows are `Dynamic` (default for current versions). --- jupyterhub/orm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/orm.py b/jupyterhub/orm.py index 471dd4e2..3198a046 100644 --- a/jupyterhub/orm.py +++ b/jupyterhub/orm.py @@ -770,8 +770,8 @@ def mysql_large_prefix_check(engine): ).fetchall() ) if ( - variables['innodb_file_format'] == 'Barracuda' - and variables['innodb_large_prefix'] == 'ON' + variables.get('innodb_file_format', 'Barracuda') == 'Barracuda' + and variables.get('innodb_large_prefix', 'ON') == 'ON' ): return True else: