MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:February 7 2006 11:16am
Subject:bk commit into 5.1 tree (tomas:1.2077) BUG#17087
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2077 06/02/07 12:16:24 tomas@stripped +1 -0
  Bug #17087  	No warning on cluster failure for IS.FILES

  sql/ha_ndbcluster.cc
    1.262 06/02/07 12:16:16 tomas@stripped +36 -17
    Bug #17087  	No warning on cluster failure for IS.FILES

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.261/sql/ha_ndbcluster.cc	2006-02-07 11:46:48 +01:00
+++ 1.262/sql/ha_ndbcluster.cc	2006-02-07 12:16:16 +01:00
@@ -9618,13 +9618,16 @@
   NdbDictionary::Dictionary* dict= ndb->getDictionary();
   NdbDictionary::Dictionary::List dflist;
   NdbError ndberr;
+  unsigned i;
+
+  DBUG_ENTER("ndbcluster_fill_files_table");
 
   dict->listObjects(dflist, NdbDictionary::Object::Datafile);
   ndberr= dict->getNdbError();
-  if (ndberr.classification != ndberror_cl_none)
-    return 0;
+  if (ndberr.classification != NdbError::NoError)
+    ERR_RETURN(ndberr);
 
-  for (unsigned i= 0; i < dflist.count; i++)
+  for (i= 0; i < dflist.count; i++)
   {
     NdbDictionary::Dictionary::List::Element& elt = dflist.elements[i];
     Ndb_cluster_connection_node_iter iter;
@@ -9632,16 +9635,24 @@
 
     g_ndb_cluster_connection->init_get_next_node(iter);
 
-    while (id= g_ndb_cluster_connection->get_next_node(iter))
+    while ((id= g_ndb_cluster_connection->get_next_node(iter)))
     {
       NdbDictionary::Datafile df= dict->getDatafile(id, elt.name);
       ndberr= dict->getNdbError();
-      if(ndberr.classification != ndberror_cl_none)
-        continue;
+      if(ndberr.classification != NdbError::NoError)
+      {
+        if (ndberr.classification == NdbError::SchemaError)
+          continue;
+        ERR_RETURN(ndberr);
+      }
       NdbDictionary::Tablespace ts= dict->getTablespace(df.getTablespace());
       ndberr= dict->getNdbError();
-      if (ndberr.classification != ndberror_cl_none)
-        continue;
+      if (ndberr.classification != NdbError::NoError)
+      {
+        if (ndberr.classification == NdbError::SchemaError)
+          continue;
+        ERR_RETURN(ndberr);
+      }
 
       int c= 0;
       table->field[c++]->set_null(); // FILE_ID
@@ -9706,10 +9717,10 @@
 
   dict->listObjects(dflist, NdbDictionary::Object::Undofile);
   ndberr= dict->getNdbError();
-  if (ndberr.classification != ndberror_cl_none)
-    return 0;
+  if (ndberr.classification != NdbError::NoError)
+    ERR_RETURN(ndberr);
 
-  for (unsigned i= 0; i < dflist.count; i++)
+  for (i= 0; i < dflist.count; i++)
   {
     NdbDictionary::Dictionary::List::Element& elt= dflist.elements[i];
     Ndb_cluster_connection_node_iter iter;
@@ -9717,17 +9728,25 @@
 
     g_ndb_cluster_connection->init_get_next_node(iter);
 
-    while (id= g_ndb_cluster_connection->get_next_node(iter))
+    while ((id= g_ndb_cluster_connection->get_next_node(iter)))
     {
       NdbDictionary::Undofile uf= dict->getUndofile(id, elt.name);
       ndberr= dict->getNdbError();
-      if (ndberr.classification != ndberror_cl_none)
-        continue;
+      if (ndberr.classification != NdbError::NoError)
+      {
+        if (ndberr.classification == NdbError::SchemaError)
+          continue;
+        ERR_RETURN(ndberr);
+      }
       NdbDictionary::LogfileGroup lfg=
         dict->getLogfileGroup(uf.getLogfileGroup());
       ndberr= dict->getNdbError();
-      if (ndberr.classification != ndberror_cl_none)
-        continue;
+      if (ndberr.classification != NdbError::NoError)
+      {
+        if (ndberr.classification == NdbError::SchemaError)
+          continue;
+        ERR_RETURN(ndberr);
+      }
 
       int c= 0;
       table->field[c++]->set_null(); // FILE_ID
@@ -9788,5 +9807,5 @@
       schema_table_store_record(thd, table);
     }
   }
-  return 0;
+  DBUG_RETURN(0);
 }
Thread
bk commit into 5.1 tree (tomas:1.2077) BUG#17087tomas7 Feb