List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 16 2011 10:03am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4202)
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4202 Magnus Blåudd	2011-02-16
      ndb
       - reverse logic for checking return value of open_indexes() so that
         function does not continue and return in the "if"

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-16 09:17:50 +0000
+++ b/sql/ha_ndbcluster.cc	2011-02-16 10:01:02 +0000
@@ -2051,15 +2051,15 @@ int ha_ndbcluster::get_metadata(THD *thd
     Approx. write size in bytes over transporter
   */
   m_bytes_per_write= 12 + tab->getRowSizeInBytes() + 4 * tab->getNoOfColumns();
-  if ((error= open_indexes(thd, ndb, table, FALSE)) == 0)
-  {
-    ndbtab_g.release();
+  if ((error= open_indexes(thd, ndb, table, FALSE)) != 0)
+    goto err;
+
+  ndbtab_g.release();
 #ifdef HAVE_NDB_BINLOG
-    ndbcluster_read_binlog_replication(thd, ndb, m_share, m_table,
-                                       ::server_id, table, FALSE);
+  ndbcluster_read_binlog_replication(thd, ndb, m_share, m_table,
+                                     ::server_id, table, FALSE);
 #endif
-    DBUG_RETURN(0);
-  }
+  DBUG_RETURN(0);
 
 err:
   ndbtab_g.invalidate();

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110216100102-i8oatqy7syeo0zi2.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4202) Magnus Blåudd16 Feb