← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Brian Aker
  • Date: 2010-12-08 18:53:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1983.
  • Revision ID: brian@tangent.org-20101208185346-89uak2ofyivk1yss
Update schema, make sure that it always ruturns a valid string (it just
makes the entire interface simpler to use).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
37
37
#include "drizzled/util/storable.h"
38
38
#include "drizzled/my_hash.h"
39
39
#include "drizzled/pthread_globals.h"
40
 
 
41
40
#include <netdb.h>
42
41
#include <sys/time.h>
43
42
#include <sys/resource.h>
60
59
#include <boost/thread/mutex.hpp>
61
60
#include <boost/thread/shared_mutex.hpp>
62
61
#include <boost/thread/condition_variable.hpp>
 
62
#include <boost/make_shared.hpp>
 
63
 
63
64
 
64
65
#define MIN_HANDSHAKE_SIZE      6
65
66
 
512
513
 
513
514
  util::string::const_shared_ptr schema() const
514
515
  {
515
 
    return _schema;
 
516
    if (_schema)
 
517
      return _schema;
 
518
 
 
519
    return util::string::const_shared_ptr(new std::string(""));
516
520
  }
517
521
  std::string catalog;
518
522
  /* current cache key */