From fc73b5b5b7caef97aad2e24c1cc7ea751e223b47 Mon Sep 17 00:00:00 2001
From: Mario Splivalo <mario.splivalo@canonical.com>
Date: Wed, 11 Feb 2015 21:16:48 +0100
Subject: [PATCH] Reverting last commit

---
 config.yaml            | 2 +-
 hooks/percona_hooks.py | 2 +-
 templates/my.cnf       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.yaml b/config.yaml
index 79d759e..3170420 100644
--- a/config.yaml
+++ b/config.yaml
@@ -68,7 +68,7 @@ options:
       InnoDB table into separate .idb file. Existing InnoDB tables will remain
       in ibdata1 file - full dump/import is needed to get rid of large
       ibdata1 file
-  retry-on-autocommit:
+  lp1366997-workaround:
     type: boolean
     default: False
     description: Adds two config options (wsrep_drupal_282555_workaround and wsrep_retry_autocommit) as a workaround for Percona Primary Key bug (see lplp1366997).
diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py
index c41e3f5..3b5d7b6 100755
--- a/hooks/percona_hooks.py
+++ b/hooks/percona_hooks.py
@@ -111,7 +111,7 @@ def render_config(clustered=False, hosts=[], mysql_password=None):
         'sst_method': 'xtrabackup',
         'sst_password': mysql_password,
         'innodb_file_per_table': config('innodb-file-per-table'),
-        'retry_on_autocommit': config('retry-on-autocommit')
+        'lp1366997_workaround': config('lp1366997-workaround')
     }
 
     print config
diff --git a/templates/my.cnf b/templates/my.cnf
index 59b9d97..782b213 100644
--- a/templates/my.cnf
+++ b/templates/my.cnf
@@ -73,7 +73,7 @@ innodb_buffer_pool_size = {{ dataset_bytes }}
 sockopt=,pf=ip6
 {% endif %}
 
-{% if retry_on_autocommit -%}
+{% if lp1366997_workaround -%}
 # Adding workaround for bug:
 #    https://bugs.launchpad.net/charms/+source/percona-cluster/+bug/1366997
 # Note that this should only be required for percona 5.5