List:Commits« Previous MessageNext Message »
From:jonas oreland Date:September 1 2011 4:04pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4493 to 4494)
View as plain text  
 4494 jonas oreland	2011-09-01
      ndb - broken testcase

    modified:
      storage/ndb/tools/ndb_config.cpp
 4493 Frazer Clement	2011-09-01
      Bug#62321 NdbApi: Blobs obscure other operations error codes
      
      Modify NdbTransaction::execute() to avoid trampling first operation
      error in NdbError object returned by NdbTransaction::getNdbError().

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/test/ndbapi/testBlobs.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/tools/ndb_config.cpp'
--- a/storage/ndb/tools/ndb_config.cpp	2011-09-01 12:37:44 +0000
+++ b/storage/ndb/tools/ndb_config.cpp	2011-09-01 16:04:16 +0000
@@ -228,7 +228,7 @@ main(int argc, char** argv){
   }
 
   if ((g_nodes && g_connections) ||
-       g_system && (g_nodes || g_connections))
+      (g_system && (g_nodes || g_connections)))
   {
     fprintf(stderr,
 	    "Error: Only one of the section-options: --nodes, --connections, --system is allowed.\n");
@@ -241,7 +241,7 @@ main(int argc, char** argv){
    */
 
   if ((g_config_file && g_mycnf) ||
-       g_config_from_node && (g_config_file || g_mycnf))
+      ((g_config_from_node != INT_MIN) && (g_config_file || g_mycnf)))
   {
     fprintf(stderr,
 	    "Error: Config should be retrieved from only one of the following sources:\n");

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4493 to 4494) jonas oreland1 Sep