← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/insert_value.cc

  • Committer: Monty Taylor
  • Date: 2009-03-22 07:55:08 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: mordred@inaugust.com-20090322075508-1h34cksq2knhaxc3
Removed global.h from a header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/insert_value.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 <drizzled/server_includes.h>
 
21
#include CSTDINT_H
21
22
#include <drizzled/error.h>
22
23
#include <drizzled/name_resolution_context.h>
23
24
#include <drizzled/table.h>
24
25
#include <drizzled/item/insert_value.h>
25
26
#include <drizzled/item/ref.h>
26
27
#include <drizzled/item/copy_string.h>
27
 
#include <drizzled/item/default_value.h>
28
28
#include <drizzled/field/null.h>
29
29
 
30
 
namespace drizzled
31
 
{
32
30
 
33
31
bool Item_insert_value::eq(const Item *item, bool binary_cmp) const
34
32
{
69
67
 
70
68
  Item_field *field_arg= (Item_field *)arg;
71
69
 
72
 
  if (field_arg->field->getTable()->insert_values.size())
 
70
  if (field_arg->field->table->insert_values)
73
71
  {
74
 
    Field *def_field= (Field*) memory::sql_alloc(field_arg->field->size_of());
 
72
    Field *def_field= (Field*) sql_alloc(field_arg->field->size_of());
75
73
    if (!def_field)
76
74
      return true;
77
75
    memcpy(def_field, field_arg->field, field_arg->field->size_of());
78
 
    def_field->move_field_offset((ptrdiff_t)
79
 
                                 (&def_field->getTable()->insert_values[0] - def_field->getTable()->record[0]));
 
76
    def_field->move_field_offset((my_ptrdiff_t)
 
77
                                 (def_field->table->insert_values -
 
78
                                  def_field->table->record[0]));
80
79
    set_field(def_field);
81
80
  }
82
81
  else
83
82
  {
84
83
    Field *tmp_field= field_arg->field;
85
84
    /* charset doesn't matter here, it's to avoid sigsegv only */
86
 
    tmp_field= new Field_null(0, 0, field_arg->field->field_name, &my_charset_bin);
 
85
    tmp_field= new Field_null(0, 0, Field::NONE, field_arg->field->field_name,
 
86
                          &my_charset_bin);
87
87
    if (tmp_field)
88
88
    {
89
 
      tmp_field->init(field_arg->field->getTable());
 
89
      tmp_field->init(field_arg->field->table);
90
90
      set_field(tmp_field);
91
91
    }
92
92
  }
102
102
}
103
103
 
104
104
 
105
 
} /* namespace drizzled */
 
105