~drizzle-trunk/drizzle/development

Viewing changes to plugin/schema_engine/schema.cc

Committer: lbieber
Date: 2010-10-07 15:39:23 UTC
mfrom: (1819.1.2 build)
Revision ID: lbieber@orisndriz08-20101007153923-e9rwa9ha5oyhjdc2

Merge Monty - Bug 655294: load_data() function returns null if file is invalid
Merge Monty - Bug 655342: select into outfile creates a garbage file on no results
Merge Monty - Fixes the haildb build

files modified:
drizzled/data_home.h

drizzled/drizzled.cc

drizzled/file_exchange.h

drizzled/function/str/load_file.cc

drizzled/main.cc

drizzled/module/library.cc

drizzled/module/library.h

drizzled/module/loader.cc

drizzled/plugin.h

drizzled/select_export.h

drizzled/select_to_file.h

drizzled/session.cc

drizzled/set_var.cc

drizzled/set_var.h

drizzled/sql_load.cc

drizzled/thr_lock.cc

plugin/haildb/plugin.ini

plugin/innobase/handler/ha_innodb.cc

plugin/pbms/src/database_ms.cc

plugin/pbms/src/mysql_ms.cc

plugin/pbms/src/mysql_ms.h

plugin/pbms/src/pbmsdaemon_ms.cc

plugin/pbms/src/system_table_ms.cc

plugin/pbms/src/transaction_ms.cc

plugin/pbxt/src/myxt_xt.cc

plugin/pbxt/src/xt_defs.h

plugin/schema_engine/schema.cc

plugin/signal_handler/signal_handler.cc

plugin/status_dictionary/variables.h

tests/r/func_str.result

tests/r/loaddata.result

tests/r/outfile.result

tests/t/func_str.test

tests/t/loaddata.test

tests/t/outfile.test

Show diffs side-by-side

added added

removed removed

plugin/schema_engine/schema.cc

void Schema::prime()

{

CachedDirectory directory(getDataHomeCatalog(), CachedDirectory::DIRECTORY);

CachedDirectory directory(getDataHomeCatalog().file_string(), CachedDirectory::DIRECTORY);

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

mutex.lock();

Older »