mirror of
https://github.com/ansible-collections/community.mysql.git
synced 2025-08-04 13:14:26 -07:00
Merge branch 'ansible-collections:main' into add_pam_service_option
This commit is contained in:
commit
2c431a2084
15 changed files with 135 additions and 119 deletions
|
@ -79,8 +79,6 @@ requirements:
|
|||
- PyMySQL (Python 2.7 and Python 3.x) or
|
||||
- MySQLdb (Python 2.x)
|
||||
notes:
|
||||
- "To avoid the C(Please explicitly state intended protocol) error, use the I(login_unix_socket) argument,
|
||||
for example, C(login_unix_socket: /run/mysqld/mysqld.sock)."
|
||||
- Requires the PyMySQL (Python 2.7 and Python 3.X) or MySQL-python (Python 2.X) package installed on the remote host.
|
||||
The Python package may be installed with apt-get install python-pymysql (Ubuntu; see M(ansible.builtin.apt)) or
|
||||
yum install python2-PyMySQL (RHEL/CentOS/Fedora; see M(ansible.builtin.yum)). You can also use dnf install python2-PyMySQL
|
||||
|
@ -107,4 +105,9 @@ notes:
|
|||
- "If credentials from the config file (for example, C(/root/.my.cnf)) are not needed to connect to a database server, but
|
||||
the file exists and does not contain a C([client]) section, before any other valid directives, it will be read and this
|
||||
will cause the connection to fail, to prevent this set it to an empty string, (for example C(config_file: ''))."
|
||||
- "To avoid the C(Please explicitly state intended protocol) error, use the I(login_unix_socket) argument,
|
||||
for example, C(login_unix_socket: /run/mysqld/mysqld.sock)."
|
||||
- Alternatively, to avoid using I(login_unix_socket) argument on each invocation you can specify the socket path
|
||||
using the `socket` option in your MySQL config file (usually C(~/.my.cnf)) on the destination host, for
|
||||
example C(socket=/var/lib/mysql/mysql.sock).
|
||||
'''
|
||||
|
|
|
@ -733,7 +733,8 @@ def privileges_grant(cursor, user, host, db_table, priv, tls_requires, maria_rol
|
|||
try:
|
||||
cursor.execute(query, params)
|
||||
except (mysql_driver.ProgrammingError, mysql_driver.OperationalError, mysql_driver.InternalError) as e:
|
||||
raise InvalidPrivsError("Error granting privileges, invalid priv string: %s" % priv_string)
|
||||
raise InvalidPrivsError("Error granting privileges, invalid priv string: %s , params: %s, query: %s ,"
|
||||
" exception: %s." % (priv_string, str(params), query, str(e)))
|
||||
|
||||
|
||||
def convert_priv_dict_to_str(priv):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue