← 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: 2011-02-24 07:11:33 UTC
  • mfrom: (2197.1.5 drizzle-build)
  • Revision ID: brian@tangent.org-20110224071133-kj27247l6bqikdtp
Rollup of all current patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
66
66
#include <drizzled/transaction_services.h>
67
67
#include <drizzled/user_var_entry.h>
68
68
#include <drizzled/util/functors.h>
 
69
#include <drizzled/util/find_ptr.h>
69
70
#include <plugin/myisam/myisam.h>
70
71
 
71
72
#include <algorithm>
1779
1780
  if (cleanup_done)
1780
1781
    return NULL;
1781
1782
 
1782
 
  UserVars::iterator iter= user_vars.find(name);
1783
 
  if (iter != user_vars.end())
1784
 
    return (*iter).second;
 
1783
  if (UserVars::mapped_type* iter= find_ptr(user_vars, name))
 
1784
    return *iter;
1785
1785
 
1786
1786
  if (not create_if_not_exists)
1787
1787
    return NULL;