List:Commits« Previous MessageNext Message »
From:Nuno Carvalho Date:February 15 2012 2:13am
Subject:bzr push into mysql-trunk branch (nuno.carvalho:3611 to 3612) WL#5223
View as plain text  
 3612 Nuno Carvalho	2012-02-15
      WL#5223
      
      Replaced for_each that do not build on Windows debug and Solaris.

    modified:
      sql/handler.cc
 3611 Nuno Carvalho	2012-02-14
      WL#5223
      
      Updated SHOW MASTER STATUS on result files.

    modified:
      mysql-test/suite/rpl/r/rpl_ip_mix.result
      mysql-test/suite/rpl/r/rpl_ip_mix2.result
      mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result
      mysql-test/suite/rpl/r/rpl_ipv6.result
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-01-15 07:33:56 +0000
+++ b/sql/handler.cc	2012-02-15 02:09:14 +0000
@@ -1322,9 +1322,18 @@ int ha_commit_trans(THD *thd, bool all)
       /*
         Call the persist operation for each storage engine.
        */
+      /* FIXME: This code does not compile on windows debug and solaris
       std::for_each(legacy_iterator<Ha_trx_info>(trans->ha_list),
                     legacy_iterator<Ha_trx_info>(),
                     Persist(thd, all));
+      */
+      Ha_trx_info *persist_ha_info= trans->ha_list;
+      for (; persist_ha_info; persist_ha_info= persist_ha_info->next())
+      {
+        handlerton *persist_ht = persist_ha_info->ht();
+        if (persist_ht->persist)
+          persist_ht->persist(persist_ht, thd, all);
+      }
 
       DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_SUICIDE(););
       if (error || (is_real_trans && xid &&

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (nuno.carvalho:3611 to 3612) WL#5223Nuno Carvalho15 Feb