← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-11-27 18:27:58 UTC
  • mfrom: (1948.2.15 catalogs)
  • Revision ID: brian@tangent.org-20101127182758-dmlrboyhsazqa1tm
Merge in additiona fixes, includes a number of bug fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
2127
2127
  return tmp_share;
2128
2128
}
2129
2129
 
 
2130
namespace display  {
 
2131
 
 
2132
static const std::string NONE= "NONE";
 
2133
static const std::string GOT_GLOBAL_READ_LOCK= "HAS GLOBAL READ LOCK";
 
2134
static const std::string MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT= "HAS GLOBAL READ LOCK WITH BLOCKING COMMIT";
 
2135
 
 
2136
const std::string &type(drizzled::Session::global_read_lock_t type)
 
2137
{
 
2138
  switch (type) {
 
2139
    default:
 
2140
    case Session::NONE:
 
2141
      return NONE;
 
2142
    case Session::GOT_GLOBAL_READ_LOCK:
 
2143
      return GOT_GLOBAL_READ_LOCK;
 
2144
    case Session::MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT:
 
2145
      return MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT;
 
2146
  }
 
2147
}
 
2148
 
 
2149
size_t max_string_length(drizzled::Session::global_read_lock_t)
 
2150
{
 
2151
  return MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT.size();
 
2152
}
 
2153
 
 
2154
} /* namespace display */
 
2155
 
2130
2156
} /* namespace drizzled */