online_alter: clean up usage of cleanup_cache_list

Author: FooBarrior

sql/online_alter.cc

@@ -182,23 +182,19 @@ int online_alter_log_row(TABLE* table, const uchar *before_record,
 }
 
 
-static void
-cleanup_cache_list(ilist<online_alter_cache_data> &list, bool ending_trans)
+static void cleanup_cache_list(ilist<online_alter_cache_data> &list)
 {
-  if (ending_trans)
+  auto it= list.begin();
+  while (it != list.end())
   {
-    auto it= list.begin();
-    while (it != list.end())
-    {
-      auto &cache= *it++;
-      cache.sink_log->release();
-      cache.reset();
-      cache.cleanup_sv();
-      delete &cache;
-    }
-    list.clear();
-    DBUG_ASSERT(list.empty());
+    auto &cache= *it++;
+    cache.sink_log->release();
+    cache.reset();
+    cache.cleanup_sv();
+    delete &cache;
   }
+  list.clear();
+  DBUG_ASSERT(list.empty());
 }
 
 
@@ -258,12 +254,12 @@ int online_alter_end_trans(Online_alter_cache_list &cache_list, THD *thd,
     {
       my_error(ER_ERROR_ON_WRITE, MYF(ME_ERROR_LOG),
                binlog->get_name(), errno);
-      cleanup_cache_list(cache_list, is_ending_transaction);
-      DBUG_RETURN(error);
+      break;
     }
   }
 
-  cleanup_cache_list(cache_list, is_ending_transaction);
+  if (is_ending_transaction)
+    cleanup_cache_list(cache_list);
 
   DBUG_RETURN(error);
 }