bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4274)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0-ndbzio/ based on revid:magnus.blaudd@stripped4m

 4274 Magnus Blåudd	2011-04-04
      ndbzio
       - remove usage of ndbzio_stream::file to check if ndbzopen failed, instead
        use return code of ndbzopen.

    modified:
      storage/ndb/src/kernel/blocks/backup/read.cpp
=== modified file 'storage/ndb/src/kernel/blocks/backup/read.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/read.cpp	2011-04-01 12:30:27 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/read.cpp	2011-04-04 08:30:10 +0000
@@ -60,11 +60,11 @@ main(int argc, const char * argv[]){
   ndbzio_stream fo;
   bzero(&fo, sizeof(fo));
   int r= ndbzopen(&fo,argv[1], O_RDONLY);
-  
-  if(fo.file < 0)
+
+  if(r != 1)
   {
-    ndbout << "Failed to open" << argv[1] << endl;
-    ndbout_c("file: %d r: %d", fo.file, r);
+    ndbout_c("Failed to open file '%s', error: %d",
+             argv[1], r);
     exit(1);
   }
 

Attachment: [text/bzr-bundle] bzr/[e-mail]