← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/default.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/default.cc
33
33
 --print-defaults         ; Print the modified command line and exit
34
34
****************************************************************************/
35
35
 
36
 
#include "mysys/mysys_priv.h"
37
 
#include <mystrings/m_string.h>
38
 
#include <mystrings/m_ctype.h>
 
36
#include "drizzled/internal/mysys_priv.h"
 
37
#include "drizzled/internal/m_string.h"
 
38
#include "drizzled/charset_info.h"
39
39
#include <drizzled/configmake.h>
40
40
#include <drizzled/gettext.h>
41
41
 
42
 
#include <mysys/cached_directory.h>
 
42
#include "drizzled/cached_directory.h"
43
43
 
44
44
#ifdef HAVE_SYS_STAT_H
45
45
# include <sys/stat.h>
675
675
                                ptr, name, line)))
676
676
          goto err;
677
677
 
678
 
        CachedDirectory dir_cache(ptr);
 
678
        drizzled::CachedDirectory dir_cache(ptr);
679
679
 
680
680
        if (dir_cache.fail())
681
681
        {
690
690
          goto err;
691
691
        }
692
692
 
693
 
        CachedDirectory::Entries files= dir_cache.getEntries();
694
 
        CachedDirectory::Entries::iterator file_iter= files.begin();
 
693
        drizzled::CachedDirectory::Entries files= dir_cache.getEntries();
 
694
        drizzled::CachedDirectory::Entries::iterator file_iter= files.begin();
695
695
 
696
696
        while (file_iter != files.end())
697
697
        {
698
 
          CachedDirectory::Entry *entry= *file_iter;
 
698
          drizzled::CachedDirectory::Entry *entry= *file_iter;
699
699
          ext= fn_ext(entry->filename.c_str());
700
700
 
701
701
          /* check extension */