Merge lp:~stewart/drizzle/bug738022 into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

patch separated out from multitenancy tree, fixes a bug we have that you really notice when you start screwing with CATALOG support.

http://hudson.drizzle.org/job/drizzle-param/787/

[Olaf van der Spek (olafvdspek)]

Hi Stewart,

Why is every argument to errmsg_printf on a new line? Should be a single line (IMO).
Why is only one of the two stat calls fixed?
Shouldn't "else if" be used instead of "if (err == 0"?

Greetings

review: Needs Fixing

=== modified file 'drizzled/cached_directory.cc'
--- drizzled/cached_directory.cc	2011-03-23 12:07:34 +0000
+++ drizzled/cached_directory.cc	2011-03-29 06:44:32 +0000
@@ -39,8 +39,12 @@
 
 #include <drizzled/cached_directory.h>
 #include <drizzled/util/find_ptr.h>
+#include <drizzled/error_t.h>
+#include <drizzled/error.h>
+#include <drizzled/errmsg_print.h>
 
 using namespace std;
+using namespace drizzled;
 
 namespace drizzled {
 
@@ -155,9 +159,14 @@
 
           buffered_fullpath.append(result->d_name);
 
-          stat(buffered_fullpath.c_str(), &entrystat);
-
-          if (S_ISDIR(entrystat.st_mode))
+          int err= stat(buffered_fullpath.c_str(), &entrystat);
+
+          if (err != 0)
+            errmsg_printf(error::WARN, ER(ER_CANT_GET_STAT),
+                          buffered_fullpath.c_str(),
+                          errno);
+
+          if (err == 0 && S_ISDIR(entrystat.st_mode))
           {
             entries.push_back(new Entry(result->d_name));
           }