← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/set_user_var.cc

  • Committer: Brian Aker
  • Date: 2009-07-11 05:59:19 UTC
  • mfrom: (1089.1.9 merge)
  • Revision ID: brian@gaz-20090711055919-m4px3crrdgta5lie
Collection of patches from new-cleanup (includes asserts for field in debug)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/set_user_var.cc
20
20
#include <drizzled/server_includes.h>
21
21
#include CSTDINT_H
22
22
#include <drizzled/function/set_user_var.h>
23
 
#include <drizzled/function/update_hash.h>
24
23
#include <drizzled/field/num.h>
25
24
#include <drizzled/session.h>
26
25
 
106
105
  */
107
106
  if ((null_value= args[0]->null_value) && null_item)
108
107
    res_type= entry->type;                      // Don't change type of item
109
 
  if (::update_hash(entry, (null_value= args[0]->null_value),
110
 
                    ptr, length, res_type, cs, dv, unsigned_arg))
 
108
  if (entry->update_hash((null_value= args[0]->null_value),
 
109
                         ptr, length, res_type, cs, dv, unsigned_arg))
111
110
  {
112
111
    null_value= 1;
113
112
    return 1;