← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

Merged remove-include-dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
20
20
#include "sql_select.h"                         // For select_describe
21
21
#include "sql_show.h"
22
22
#include "repl_failsafe.h"
23
 
#include <my_dir.h>
 
23
#include <mysys/my_dir.h>
24
24
 
25
25
#define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
26
26
 
252
252
               continue;
253
253
       }
254
254
#endif
255
 
      if (!MY_S_ISDIR(file->mystat->st_mode))
 
255
      if (!S_ISDIR(file->mystat->st_mode))
256
256
        continue;
257
257
 
258
258
      file_name_len= filename_to_tablename(file->name, uname, sizeof(uname));