← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.cc

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/default_value.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
23
23
#include <drizzled/name_resolution_context.h>
24
24
#include <drizzled/table.h>
25
25
#include <drizzled/session.h>
 
26
#include <drizzled/current_session.h>
26
27
#include <drizzled/item/default_value.h>
27
28
 
28
29
namespace drizzled
68
69
    goto error;
69
70
  memcpy(def_field, field_arg->field, field_arg->field->size_of());
70
71
  def_field->move_field_offset((ptrdiff_t)
71
 
                               (def_field->getTable()->getDefaultValues() - def_field->getTable()->record[0]));
 
72
                               (def_field->table->getDefaultValues() - def_field->table->record[0]));
72
73
  set_field(def_field);
73
74
  return false;
74
75
 
105
106
      }
106
107
 
107
108
      {
108
 
        push_warning_printf(field_arg->getTable()->in_use,
 
109
        push_warning_printf(field_arg->table->in_use,
109
110
                            DRIZZLE_ERROR::WARN_LEVEL_WARN,
110
111
                            ER_NO_DEFAULT_FOR_FIELD,
111
112
                            ER(ER_NO_DEFAULT_FOR_FIELD),
138
139
    change records at each execution.
139
140
  */
140
141
  if (arg != new_item)
141
 
    getSession().change_item_tree(&arg, new_item);
142
 
 
 
142
    current_session->change_item_tree(&arg, new_item);
143
143
  return (this->*transformer)(args);
144
144
}
145
145