← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/get_user_var.cc

Reverted my change to interval_list

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_user_var.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
22
 
#include <float.h>
23
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
24
22
#include <drizzled/function/get_user_var.h>
25
23
#include <drizzled/item/null.h>
26
24
#include <drizzled/sql_parse.h>
27
25
#include <drizzled/session.h>
28
26
 
29
 
namespace drizzled
30
 
{
31
 
 
32
 
String *Item_func_get_user_var::val_str(String *str)
 
27
String *
 
28
Item_func_get_user_var::val_str(String *str)
33
29
{
34
30
  assert(fixed == 1);
35
31
  if (!var_entry)
118
114
 
119
115
bool Item_func_get_user_var::const_item() const
120
116
{
121
 
  return (!var_entry || current_session->getQueryId() != var_entry->update_query_id);
 
117
  return (!var_entry || current_session->query_id != var_entry->update_query_id);
122
118
}
123
119
 
124
120
 
151
147
  return (name.length == other->name.length &&
152
148
          !memcmp(name.str, other->name.str, name.length));
153
149
}
154
 
 
155
 
} /* namespace drizzled */