← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/table_cache_dictionary/table_definition_cache.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/table_cache_dictionary/table_definition_cache.cc
31
31
{
32
32
  add_field("TABLE_SCHEMA");
33
33
  add_field("TABLE_NAME");
34
 
  add_field("VERSION", plugin::TableFunction::NUMBER);
35
 
  add_field("TABLE_COUNT", plugin::TableFunction::NUMBER);
36
 
  add_field("IS_NAME_LOCKED", plugin::TableFunction::BOOLEAN);
 
34
  add_field("VERSION", plugin::TableFunction::NUMBER, 0, false);
 
35
  add_field("TABLE_COUNT", plugin::TableFunction::NUMBER, 0, false);
 
36
  add_field("IS_NAME_LOCKED", plugin::TableFunction::BOOLEAN, 0, false);
37
37
}
38
38
 
39
39
table_cache_dictionary::TableDefinitionCache::Generator::Generator(drizzled::Field **arg) :
40
40
  drizzled::plugin::TableFunction::Generator(arg),
41
41
  is_primed(false)
42
42
{
43
 
  pthread_mutex_lock(&LOCK_open); /* Optionally lock for remove tables from open_cahe if not in use */
 
43
  LOCK_open.lock(); /* Optionally lock for remove tables from open_cahe if not in use */
44
44
}
45
45
 
46
46
table_cache_dictionary::TableDefinitionCache::Generator::~Generator()
47
47
{
48
 
  pthread_mutex_unlock(&LOCK_open); /* Optionally lock for remove tables from open_cahe if not in use */
 
48
  LOCK_open.unlock(); /* Optionally lock for remove tables from open_cahe if not in use */
49
49
}
50
50
 
51
51
bool table_cache_dictionary::TableDefinitionCache::Generator::nextCore()