lp:1023404 problems with savepoints and tokudb with 5.5

fix incorrect merge
This commit is contained in:
Sergei Golubchik 2012-07-11 16:19:05 +02:00
parent 703ee1ad1b
commit a08631d696

View file

@ -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