Fix removed client_found_rows mysql variable (#101) (#102)

* Fix removed client_found_rows mysql variable As of ProxySQL 2.4.0, client_found_rows variable has been removed. SEE: sysown/proxysql@02915a9 * Add changelog fragment Co-authored-by: Jonathan Piron <[email protected]>
ansible-collections · May 23, 2022 · 0606527 · 0606527
1 parent 5dc8ce2
commit 0606527
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/changelogs/fragments/101-removed-mysql-variable.yml b/changelogs/fragments/101-removed-mysql-variable.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - roles/proxysql - As of ProxySQL 2.4.0, `client_found_rows` mysql variable has been removed (https://github.com/ansible-collections/community.proxysql/pull/101).
diff --git a/roles/proxysql/vars/main.yml b/roles/proxysql/vars/main.yml
@@ -104,16 +104,13 @@ proxysql_admin_variables:
     variable: "web_port"
     variable_value: "{{ proxysql_admin_web_port }}"
 
-proxysql_mysql_variables:
+_proxysql_mysql_variables:
   autocommit_false_is_transaction:
     variable: "autocommit_false_is_transaction"
     variable_value: "{{ proxysql_mysql_autocommit_false_is_transaction | to_json }}"
   autocommit_false_not_reusable:
     variable: "autocommit_false_not_reusable"
     variable_value: "{{ proxysql_mysql_autocommit_false_not_reusable | to_json }}"
-  client_found_rows:
-    variable: "client_found_rows"
-    variable_value: "{{ proxysql_mysql_client_found_rows | to_json }}"
   commands_stats:
     variable: "commands_stats"
     variable_value: "{{ proxysql_mysql_commands_stats | to_json }}"
@@ -376,6 +373,13 @@ proxysql_mysql_variables:
     variable: "wait_timeout"
     variable_value: "{{ proxysql_mysql_mysql_wait_timeout }}"
 
+_proxysql_mysql_client_found_rows:
+  client_found_rows:
+    variable: "client_found_rows"
+    variable_value: "{{ proxysql_mysql_client_found_rows | to_json }}"
+
+proxysql_mysql_variables: "{{ _proxysql_mysql_variables | combine((proxysql_version is version('2.4.0', '<')) | ternary(_proxysql_mysql_client_found_rows, {})) }}"
+
 proxysql_mysql_options:
   mysql_threads:
     variable: "threads"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- roles/proxysql - As of ProxySQL 2.4.0, `client_found_rows` mysql variable has been removed (https://github.com/ansible-collections/community.proxysql/pull/101).