← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Monty Taylor
  • Date: 2009-01-25 14:29:57 UTC
  • mfrom: (811 drizzle)
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 816.
  • Revision ID: mordred@inaugust.com-20090125142957-qd2dc0x4lbdeut84
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
285
285
      }
286
286
 
287
287
      // if we are not in slave thread, the file must be:
288
 
      if (!session->slave_thread &&
289
 
          !((stat_info.st_mode & S_IROTH) == S_IROTH &&  // readable by others
290
 
            (stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
291
 
            ((stat_info.st_mode & S_IFREG) == S_IFREG ||
292
 
             (stat_info.st_mode & S_IFIFO) == S_IFIFO)))
 
288
      if (!((stat_info.st_mode & S_IROTH) == S_IROTH &&  // readable by others
 
289
            (stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
 
290
            ((stat_info.st_mode & S_IFREG) == S_IFREG ||
 
291
             (stat_info.st_mode & S_IFIFO) == S_IFIFO)))
293
292
      {
294
293
        my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name);
295
294
        return(true);