← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
273
273
   */
274
274
  char *thread_stack;
275
275
 
276
 
  identifier::User::const_shared_ptr user() const
 
276
  identifier::user::ptr user() const
277
277
  {
278
 
    return security_ctx ? security_ctx : identifier::User::const_shared_ptr();
 
278
    return security_ctx ? security_ctx : identifier::user::ptr();
279
279
  }
280
280
 
281
 
  void setUser(identifier::User::shared_ptr arg)
 
281
  void setUser(identifier::user::mptr arg)
282
282
  {
283
283
    security_ctx= arg;
284
284
  }
1370
1370
  bool tablespace_op; /**< This is true in DISCARD/IMPORT TABLESPACE */
1371
1371
  bool use_usage;
1372
1372
  rusage usage;
1373
 
  identifier::User::shared_ptr security_ctx;
 
1373
  identifier::user::mptr security_ctx;
1374
1374
  int32_t scoreboard_index;
1375
1375
  plugin::Client *client;
1376
1376
  util::string::shared_ptr _schema;