← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
184
184
          condition, so that we can give a better error message -
185
185
          ER_WRONG_FIELD_WITH_GROUP, instead of the less informative
186
186
          ER_BAD_FIELD_ERROR which we produce now.
 
187
 
 
188
          @todo determine if this is valid.
187
189
        */
188
190
        if ((place != IN_HAVING ||
189
191
             (!select->with_sum_func &&
244
246
              } while (outer_context && outer_context->select_lex &&
245
247
                       cached_table->select_lex != outer_context->select_lex);
246
248
            }
247
 
            prev_subselect_item->used_tables_cache|= from_field->table->map;
 
249
            prev_subselect_item->used_tables_cache|= from_field->getTable()->map;
248
250
            prev_subselect_item->const_item_cache= 0;
249
251
            break;
250
252
          }