From d517d658a10b404f674fa383cc0173ef12554a2b Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 16 Apr 2021 07:08:18 +0200
Subject: [PATCH 1/4] Update galaxy.yml

---
 galaxy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/galaxy.yml b/galaxy.yml
index dad76b9..812add0 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: mysql
-version: 1.3.0
+version: 1.3.1
 readme: README.md
 authors:
   - Ansible community

From 59cbe5ffe36db4ce40129bc1a93610ba99c5a134 Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 16 Apr 2021 08:53:51 +0200
Subject: [PATCH 2/4] Release 1.4.0

---
 changelogs/CHANGELOG.rst                      | 28 +++++++++++++++++++
 changelogs/changelog.yaml                     | 28 +++++++++++++++++++
 .../fragments/101-drop-requiressl-support.yml |  4 ---
 .../103-mysql_and_mariadb_divergence.yml      |  2 --
 .../fragments/108-mysql_priv_add_grant.yml    |  2 --
 ...d_mysql_full_version_suffix_return_var.yml |  2 --
 ...ange_deprecated_connection_ parameters.yml |  2 --
 galaxy.yml                                    |  2 +-
 8 files changed, 57 insertions(+), 13 deletions(-)
 delete mode 100644 changelogs/fragments/101-drop-requiressl-support.yml
 delete mode 100644 changelogs/fragments/103-mysql_and_mariadb_divergence.yml
 delete mode 100644 changelogs/fragments/108-mysql_priv_add_grant.yml
 delete mode 100644 changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
 delete mode 100644 changelogs/fragments/116-change_deprecated_connection_ parameters.yml

diff --git a/changelogs/CHANGELOG.rst b/changelogs/CHANGELOG.rst
index a80c771..70dcb21 100644
--- a/changelogs/CHANGELOG.rst
+++ b/changelogs/CHANGELOG.rst
@@ -5,6 +5,34 @@ Community MySQL Collection Release Notes
 .. contents:: Topics
 
 
+v1.4.0
+======
+
+Release Summary
+---------------
+
+This is the minor release of the ``community.mysql`` collection.
+This changelog contains all changes to the modules in this collection
+that have been added after the release of ``community.mysql`` 1.3.0.'
+
+Major Changes
+-------------
+
+- mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires`` option in ``community.mysql`` 2.0.0 and support will be dropped altogether in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).
+
+Minor Changes
+-------------
+
+- mysql module utils - change deprecated connection parameters ``passwd`` and ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).
+- mysql_collection - introduce codebabse split to handle divergences between MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).
+- mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
+- mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
+
+Bugfixes
+--------
+
+- mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).
+
 v1.3.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index c163341..33c4b2f 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -235,3 +235,31 @@ releases:
     - 107-mysql_user_fix_grant_on_col_handling.yml
     - 97-mysql_replication_deprecate_offending_terminology.yml
     release_date: '2021-03-08'
+  1.4.0:
+    changes:
+      bugfixes:
+      - mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).
+      major_changes:
+      - mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires``
+        option in ``community.mysql`` 2.0.0 and support will be dropped altogether
+        in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).
+      minor_changes:
+      - mysql module utils - change deprecated connection parameters ``passwd`` and
+        ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).
+      - mysql_collection - introduce codebabse split to handle divergences between
+        MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).
+      - mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
+      - mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
+      release_summary: 'This is the minor release of the ``community.mysql`` collection.
+
+        This changelog contains all changes to the modules in this collection
+
+        that have been added after the release of ``community.mysql`` 1.3.0.'''
+    fragments:
+    - 1.4.0.yml
+    - 101-drop-requiressl-support.yml
+    - 103-mysql_and_mariadb_divergence.yml
+    - 108-mysql_priv_add_grant.yml
+    - 115-add_mysql_full_version_suffix_return_var.yml
+    - 116-change_deprecated_connection_ parameters.yml
+    release_date: '2021-04-16'
diff --git a/changelogs/fragments/101-drop-requiressl-support.yml b/changelogs/fragments/101-drop-requiressl-support.yml
deleted file mode 100644
index fded3e3..0000000
--- a/changelogs/fragments/101-drop-requiressl-support.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-minor_changes:
-  - mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
-major_changes:
-  - mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires`` option in ``community.mysql`` 2.0.0 and support will be dropped altogether in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).
diff --git a/changelogs/fragments/103-mysql_and_mariadb_divergence.yml b/changelogs/fragments/103-mysql_and_mariadb_divergence.yml
deleted file mode 100644
index 039c654..0000000
--- a/changelogs/fragments/103-mysql_and_mariadb_divergence.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-- mysql_collection - introduce codebabse split to handle divergences between MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).
diff --git a/changelogs/fragments/108-mysql_priv_add_grant.yml b/changelogs/fragments/108-mysql_priv_add_grant.yml
deleted file mode 100644
index 4cfd00e..0000000
--- a/changelogs/fragments/108-mysql_priv_add_grant.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).
diff --git a/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml b/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
deleted file mode 100644
index 3eadb46..0000000
--- a/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-- mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
diff --git a/changelogs/fragments/116-change_deprecated_connection_ parameters.yml b/changelogs/fragments/116-change_deprecated_connection_ parameters.yml
deleted file mode 100644
index d6b0d7e..0000000
--- a/changelogs/fragments/116-change_deprecated_connection_ parameters.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-- mysql module utils - change deprecated connection parameters ``passwd`` and ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).
\ No newline at end of file
diff --git a/galaxy.yml b/galaxy.yml
index 812add0..61bd774 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: mysql
-version: 1.3.1
+version: 1.4.0
 readme: README.md
 authors:
   - Ansible community

From fe8f3662eb0088b813c83866b555b940ab9ece77 Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 23 Apr 2021 15:08:49 +0300
Subject: [PATCH 3/4] mysql: revert changes made in PR 116 (#153) (#156)

* mysql: revert changes made in PR 116

* Add changelog fragment

* Fix CI

* Fix CI

* Fix CI

* Update CI

* Fix CI

(cherry picked from commit 738343d64c058207f2e14aa4a03ac0cb1713304a)
---
 .github/workflows/ansible-test-plugins.yml                  | 2 +-
 changelogs/fragments/153-mysql_revert_connector_changes.yml | 2 ++
 plugins/module_utils/mysql.py                               | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/153-mysql_revert_connector_changes.yml

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index 7e5c33d..da79c04 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -61,7 +61,7 @@ jobs:
           - stable-2.9
           - stable-2.10
           - stable-2.11
-          - devel
+          #- devel
         python:
           - 3.6
         connector:
diff --git a/changelogs/fragments/153-mysql_revert_connector_changes.yml b/changelogs/fragments/153-mysql_revert_connector_changes.yml
new file mode 100644
index 0000000..48c8b36
--- /dev/null
+++ b/changelogs/fragments/153-mysql_revert_connector_changes.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
diff --git a/plugins/module_utils/mysql.py b/plugins/module_utils/mysql.py
index 67e0033..5af9c20 100644
--- a/plugins/module_utils/mysql.py
+++ b/plugins/module_utils/mysql.py
@@ -79,7 +79,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
     if login_user is not None:
         config['user'] = login_user
     if login_password is not None:
-        config['password'] = login_password
+        config['passwd'] = login_password
     if ssl_cert is not None:
         config['ssl']['cert'] = ssl_cert
     if ssl_key is not None:
@@ -87,7 +87,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
     if ssl_ca is not None:
         config['ssl']['ca'] = ssl_ca
     if db is not None:
-        config['database'] = db
+        config['db'] = db
     if connect_timeout is not None:
         config['connect_timeout'] = connect_timeout
     if check_hostname is not None:

From b3a83aa0a322e44a06f79d82786b41d20f20823a Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 23 Apr 2021 16:59:12 +0300
Subject: [PATCH 4/4] Release 1.4.1 commit (#159)

---
 changelogs/CHANGELOG.rst                          | 15 +++++++++++++++
 changelogs/changelog.yaml                         | 14 ++++++++++++++
 .../153-mysql_revert_connector_changes.yml        |  2 --
 galaxy.yml                                        |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
 delete mode 100644 changelogs/fragments/153-mysql_revert_connector_changes.yml

diff --git a/changelogs/CHANGELOG.rst b/changelogs/CHANGELOG.rst
index 70dcb21..c03a3c6 100644
--- a/changelogs/CHANGELOG.rst
+++ b/changelogs/CHANGELOG.rst
@@ -5,6 +5,21 @@ Community MySQL Collection Release Notes
 .. contents:: Topics
 
 
+v1.4.1
+======
+
+Release Summary
+---------------
+
+This is the patch release of the ``community.mysql`` collection.
+This changelog contains all changes to the modules in this collection
+that have been added after the release of ``community.mysql`` 1.4.0.
+
+Bugfixes
+--------
+
+- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+
 v1.4.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 33c4b2f..a8a0d28 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -263,3 +263,17 @@ releases:
     - 115-add_mysql_full_version_suffix_return_var.yml
     - 116-change_deprecated_connection_ parameters.yml
     release_date: '2021-04-16'
+  1.4.1:
+    changes:
+      bugfixes:
+      - mysql - revert changes of connector arguments made in pull request 116 causing
+        the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+      release_summary: 'This is the patch release of the ``community.mysql`` collection.
+
+        This changelog contains all changes to the modules in this collection
+
+        that have been added after the release of ``community.mysql`` 1.4.0.'
+    fragments:
+    - 1.4.1.yml
+    - 153-mysql_revert_connector_changes.yml
+    release_date: '2021-04-23'
diff --git a/changelogs/fragments/153-mysql_revert_connector_changes.yml b/changelogs/fragments/153-mysql_revert_connector_changes.yml
deleted file mode 100644
index 48c8b36..0000000
--- a/changelogs/fragments/153-mysql_revert_connector_changes.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
diff --git a/galaxy.yml b/galaxy.yml
index 61bd774..79811d5 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: mysql
-version: 1.4.0
+version: 1.4.1
 readme: README.md
 authors:
   - Ansible community