← Back to branch summary

~drizzle-developers/ubuntu/karmic/drizzle/ppa

« back to all changes in this revision

Viewing changes to drizzled/table/concurrent.cc

  • Committer: Monty Taylor
  • Date: 2010-11-24 18:44:57 UTC
  • mfrom: (1308.1.31 trunk)
  • Revision ID: mordred@inaugust.com-20101124184457-qd6jvoe2wgnvl3yq
Tags: 2010.11.04-0ubuntu1~karmic1
http://bugs.debian.org/602662
* New upstream release.
* Turn off -Werror for packaging builds. (Closes: #602662)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/concurrent.cc
52
52
  pointer.
53
53
 
54
54
  NOTE
55
 
  This function assumes that its caller already acquired LOCK_open mutex.
 
55
  This function assumes that its caller already acquired table::Cache::singleton().mutex() mutex.
56
56
 
57
57
  RETURN VALUE
58
58
  false - Success
61
61
 
62
62
bool Concurrent::reopen_name_locked_table(TableList* table_list, Session *session)
63
63
{
64
 
  safe_mutex_assert_owner(LOCK_open.native_handle());
 
64
  safe_mutex_assert_owner(table::Cache::singleton().mutex().native_handle());
65
65
 
66
66
  if (session->getKilled())
67
67
    return true;
110
110
 
111
111
  NOTES
112
112
  Extra argument for open is taken from session->open_options
113
 
  One must have a lock on LOCK_open when calling this function
 
113
  One must have a lock on table::Cache::singleton().mutex() when calling this function
114
114
 
115
115
  RETURN
116
116
  0     ok
122
122
                                         TableIdentifier &identifier)
123
123
{
124
124
  int error;
125
 
  TableSharePtr share;
 
125
  TableShare::shared_ptr share;
126
126
  uint32_t discover_retry_count= 0;
127
127
 
128
 
  safe_mutex_assert_owner(LOCK_open.native_handle());
 
128
  safe_mutex_assert_owner(table::Cache::singleton().mutex().native_handle());
129
129
retry:
130
130
  if (not (share= TableShare::getShareCreate(session,
131
131
                                             identifier,