← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/outer_ref.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/outer_ref.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 <drizzled/item/uint.h>
23
23
#include <drizzled/item/outer_ref.h>
24
24
 
25
 
namespace drizzled
26
 
{
 
25
namespace drizzled {
27
26
 
28
27
/*
29
28
  Prepare referenced outer field then call usual Item_direct_ref::fix_fields
40
39
 
41
40
bool Item_outer_ref::fix_fields(Session *session, Item **reference)
42
41
{
43
 
  bool err;
44
42
  /* outer_ref->check_cols() will be made in Item_direct_ref::fix_fields */
45
43
  if ((*ref) && !(*ref)->fixed && ((*ref)->fix_fields(session, reference)))
46
44
    return true;
47
 
  err= Item_direct_ref::fix_fields(session, reference);
 
45
  bool err= Item_direct_ref::fix_fields(session, reference);
48
46
  if (!outer_ref)
49
47
    outer_ref= *ref;
50
48
  if ((*ref)->type() == Item::FIELD_ITEM)