← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <boost/lexical_cast.hpp>
23
23
#include <boost/exception/get_error_info.hpp>
24
24
#include <string>
25
25
 
26
 
#include <drizzled/session.h>
27
 
#include <drizzled/item/string.h>
28
 
#include <drizzled/sql_list.h>
29
 
#include <drizzled/function/set_user_var.h>
 
26
#include "drizzled/session.h"
 
27
#include "drizzled/item/string.h"
 
28
#include "drizzled/sql_list.h"
30
29
 
31
30
using namespace std;
32
31
 
76
75
  }
77
76
 
78
77
err:
79
 
  free_underlaid_joins(session, &session->getLex()->select_lex);
 
78
  free_underlaid_joins(session, &session->lex->select_lex);
80
79
  return(error);
81
80
}
82
81