← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
31
31
#include <google/protobuf/io/zero_copy_stream.h>
32
32
#include <google/protobuf/io/zero_copy_stream_impl.h>
33
33
 
34
 
#include "drizzled/internal/my_dir.h"
35
34
#include "drizzled/my_hash.h"
36
35
#include "drizzled/cached_directory.h"
37
36
 
872
871
       entry_iter != entries.end(); ++entry_iter)
873
872
  {
874
873
    CachedDirectory::Entry *entry= *entry_iter;
875
 
    string *filename= &entry->filename;
 
874
    const string *filename= &entry->filename;
876
875
 
877
876
    assert(filename->size());
878
877