Fix mysql.py logic related to 53326 (#61832)

ansible · Sep 6, 2019 · e4d4e49 · e4d4e49
1 parent 4f29b5a
commit e4d4e49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/ansible/module_utils/mysql.py b/lib/ansible/module_utils/mysql.py
@@ -84,7 +84,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
     except Exception as e:
         module.fail_json(msg="unable to connect to database: %s" % to_native(e))
 
-    if cursor_class is not None:
+    if cursor_class == 'DictCursor':
         return db_connection.cursor(**{_mysql_cursor_param: mysql_driver.cursors.DictCursor})
     else:
         return db_connection.cursor()

diff --git a/lib/ansible/modules/database/mysql/mysql_replication.py b/lib/ansible/modules/database/mysql/mysql_replication.py
@@ -257,7 +257,8 @@ def main():
     login_user = module.params["login_user"]
 
     try:
-        cursor = mysql_connect(module, login_user, login_password, config_file, ssl_cert, ssl_key, ssl_ca, None, 'mysql_driver.cursors.DictCursor',
+        cursor = mysql_connect(module, login_user, login_password, config_file,
+                               ssl_cert, ssl_key, ssl_ca, None, cursor_class='DictCursor',
                                connect_timeout=connect_timeout)
     except Exception as e:
         if os.path.exists(config_file):