cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Andrey Klychkov 2019-09-06 15:53:54 +03:00 committed by John R Barker
parent 4f29b5a76b
commit e4d4e49388
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/mysql.py
View file

@ -84,7 +84,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
except Exception as e: except Exception as e:
module.fail_json(msg="unable to connect to database: %s" % to_native(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}) return db_connection.cursor(**{_mysql_cursor_param: mysql_driver.cursors.DictCursor})
else: else:
return db_connection.cursor() return db_connection.cursor()

3
lib/ansible/modules/database/mysql/mysql_replication.py
View file

@ -257,7 +257,8 @@ def main():
login_user = module.params["login_user"] login_user = module.params["login_user"]
try: 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) connect_timeout=connect_timeout)
except Exception as e: except Exception as e:
if os.path.exists(config_file): if os.path.exists(config_file):