From a08631d6964141577fd345f34292de4ba90421ba Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Wed, 11 Jul 2012 16:19:05 +0200
Subject: [PATCH] lp:1023404 problems with savepoints and tokudb with 5.5

fix incorrect merge
---
 sql/handler.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index b7d545a75dc..ecd02e2a1be 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -504,10 +504,6 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
                             "Assigning value %d.", plugin->plugin->name, idx);
         hton->db_type= (enum legacy_db_type) idx;
       }
-      installed_htons[hton->db_type]= hton;
-      tmp= hton->savepoint_offset;
-      hton->savepoint_offset= savepoint_alloc_size;
-      savepoint_alloc_size+= tmp;
 
       /*
         In case a plugin is uninstalled and re-installed later, it should