← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Lee Bieber
  • Date: 2011-02-20 02:08:06 UTC
  • mfrom: (2183.2.3 list)
  • Revision ID: kalebral@gmail.com-20110220020806-ad95ldlm2rfahrrr
Merge Olaf - change List_iterator_fast to List<Item>::iterator

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
308
308
      assert(!empty_table);
309
309
      empty_table= (Table*) session->calloc(sizeof(Table));
310
310
      types.clear();
311
 
      List_iterator_fast<Item> it(sl->item_list);
 
311
      List<Item>::iterator it(sl->item_list);
312
312
      Item *item_tmp;
313
313
      while ((item_tmp= it++))
314
314
      {
327
327
                   ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT),MYF(0));
328
328
        goto err;
329
329
      }
330
 
      List_iterator_fast<Item> it(sl->item_list);
331
 
      List_iterator_fast<Item> tp(types);
 
330
      List<Item>::iterator it(sl->item_list);
 
331
      List<Item>::iterator tp(types);
332
332
      Item *type, *item_tmp;
333
333
      while ((type= tp++, item_tmp= it++))
334
334
      {
344
344
      Check that it was possible to aggregate
345
345
      all collations together for UNION.
346
346
    */
347
 
    List_iterator_fast<Item> tp(types);
 
347
    List<Item>::iterator tp(types);
348
348
    Item *type;
349
349
    uint64_t create_options;
350
350