← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-05 21:25:02 UTC
  • mfrom: (2322 drizzle)
  • mto: (2318.2.9 rf)
  • mto: This revision was merged to the branch mainline in revision 2333.
  • Revision ID: olafvdspek@gmail.com-20110605212502-5c48zm4e9kdtyrys
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
87
87
                                     Item *cond,
88
88
                                     Item *field,
89
89
                                     Item *value);
90
 
static bool copy_blobs(Field **ptr);
 
90
static void copy_blobs(Field **ptr);
91
91
 
92
92
static bool eval_const_cond(COND *cond)
93
93
{
102
102
const char *subq_sj_cond_name=
103
103
  "0123456789ABCDEF0123456789abcdef0123456789ABCDEF0123456789abcdef-sj-cond";
104
104
 
105
 
static bool copy_blobs(Field **ptr)
 
105
static void copy_blobs(Field **ptr)
106
106
{
107
107
  for (; *ptr ; ptr++)
108
108
  {
109
109
    if ((*ptr)->flags & BLOB_FLAG)
110
 
      if (((Field_blob *) (*ptr))->copy())
111
 
        return 1;                               // Error
 
110
      ((Field_blob *) (*ptr))->copy();
112
111
  }
113
 
  return 0;
114
112
}
115
113
 
116
114
/**
5053
5051
      error=cursor->rnd_next(record);
5054
5052
      continue;
5055
5053
    }
5056
 
    if (copy_blobs(first_field))
5057
 
    {
5058
 
      my_message(ER_OUTOFMEMORY, ER(ER_OUTOFMEMORY), MYF(0));
5059
 
      error=0;
5060
 
      goto err;
5061
 
    }
 
5054
    copy_blobs(first_field);
5062
5055
    memcpy(new_record,org_record,reclength);
5063
5056
 
5064
5057
    /* Read through rest of cursor and mark duplicated rows deleted */