← 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 "drizzled/internal/mysys_priv.h"
 
36
#include "config.h"
 
37
 
 
38
#include "drizzled/internal/my_sys.h"
37
39
#include "drizzled/internal/m_string.h"
38
40
#include "drizzled/charset_info.h"
39
41
#include <drizzled/configmake.h>
48
50
#include <cstdio>
49
51
#include <algorithm>
50
52
 
51
 
 
52
 
using namespace drizzled;
53
53
using namespace std;
54
54
 
 
55
namespace drizzled
 
56
{
 
57
namespace internal
 
58
{
 
59
 
55
60
const char *my_defaults_file=0;
56
61
const char *my_defaults_group_suffix=0;
57
62
char *my_defaults_extra_file=0;
676
681
                                ptr, name, line)))
677
682
          goto err;
678
683
 
679
 
        drizzled::CachedDirectory dir_cache(ptr);
 
684
        CachedDirectory dir_cache(ptr);
680
685
 
681
686
        if (dir_cache.fail())
682
687
        {
691
696
          goto err;
692
697
        }
693
698
 
694
 
        drizzled::CachedDirectory::Entries files= dir_cache.getEntries();
695
 
        drizzled::CachedDirectory::Entries::iterator file_iter= files.begin();
 
699
        CachedDirectory::Entries files= dir_cache.getEntries();
 
700
        CachedDirectory::Entries::iterator file_iter= files.begin();
696
701
 
697
702
        while (file_iter != files.end())
698
703
        {
699
 
          drizzled::CachedDirectory::Entry *entry= *file_iter;
 
704
          CachedDirectory::Entry *entry= *file_iter;
700
705
          ext= fn_ext(entry->filename.c_str());
701
706
 
702
707
          /* check extension */
983
988
  ADD_COMMON_DIRECTORIES();
984
989
  ADD_DIRECTORY("~/");
985
990
}
 
991
 
 
992
} /* namespace internal */
 
993
} /* namespace drizzled */