~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Merged remove-include-dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
#include <mysys/my_getopt.h>
58
58
#include <mysys/thr_alarm.h>
59
59
#include <storage/myisam/myisam.h>
60
 
#include <my_dir.h>
61
60
 
62
61
extern CHARSET_INFO *character_set_filesystem;
63
62
 
2167
2166
      'write' permission.
2168
2167
    */
2169
2168
 
2170
 
    if (!MY_S_ISREG(f_stat.st_mode) ||
2171
 
        !(f_stat.st_mode & MY_S_IWRITE))
 
2169
    if (!S_ISREG(f_stat.st_mode) ||
 
2170
        !(f_stat.st_mode & S_IWRITE))
2172
2171
      goto err;
2173
2172
 
2174
2173
    return 0;