~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

Committer: Monty Taylor
Date: 2010-04-16 05:36:53 UTC
mfrom: (1300.5.27 drizzled-as-lib)
mto: (1461.2.2 more-valgrind)
mto: This revision was merged to the branch mainline in revision 1479.
Revision ID: mordred@inaugust.com-20100416053653-5zx8lpzai23jojv6

Merged in old drizzled-as-lib patch.

files added:
drizzled/drizzled.h

drizzled/main.cc

drizzled/signal_handler.cc

drizzled/signal_handler.h

files modified:
Makefile.am

drizzled/data_home.h

drizzled/drizzled.cc

drizzled/function/str/load_file.cc

drizzled/include.am

drizzled/internal/include.am

drizzled/internal/my_pthread.h

drizzled/message/include.am

drizzled/pthread_globals.h

drizzled/schema_identifier.cc

drizzled/session.cc

drizzled/set_var.cc

drizzled/sql_base.cc

drizzled/sql_load.cc

drizzled/stacktrace.cc

drizzled/stacktrace.h

drizzled/table_identifier.cc

extra/include.am

plugin/innobase/handler/ha_innodb.cc

plugin/myisam/plugin.ini

plugin/pbxt/src/myxt_xt.cc

plugin/pbxt/src/xt_defs.h

plugin/schema_engine/schema.cc

plugin/signal_handler/signal_handler.cc

support-files/drizzle.spec.in

tests/test-run.pl

tests/valgrind.supp

Show diffs side-by-side

added added

removed removed

plugin/schema_engine/schema.cc

void Schema::prime()

{

CachedDirectory directory(drizzle_data_home, CachedDirectory::DIRECTORY);

CachedDirectory directory(data_home, CachedDirectory::DIRECTORY);

CachedDirectory::Entries files= directory.getEntries();

pthread_rwlock_wrlock(&schema_lock);

113

114

// If for some reason getting a lock should fail, we resort to disk

115

116

CachedDirectory directory(drizzle_data_home, CachedDirectory::DIRECTORY);

116

CachedDirectory directory(data_home, CachedDirectory::DIRECTORY);

117

118

CachedDirectory::Entries files= directory.getEntries();

119

Older »