← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Jay Pipes
  • Date: 2008-08-25 21:12:17 UTC
  • mfrom: (322.2.4 stdize-code)
  • Revision ID: jay@mysql.com-20080825211217-eqvfmcgvkoktdvtr
From Mats.  Corrected build issue with missing Makefile target

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
866
866
    pthread_mutex_lock(&thd->mysys_var->mutex);
867
867
    thd->mysys_var->current_mutex= 0;
868
868
    thd->mysys_var->current_cond= 0;
869
 
    thd->proc_info=0;
 
869
    thd->set_proc_info(0);
870
870
    pthread_mutex_unlock(&thd->mysys_var->mutex);
871
871
  }
872
872
 
1717
1717
  const char *proc_info;
1718
1718
  thd->mysys_var->current_mutex= mutex;
1719
1719
  thd->mysys_var->current_cond= cond;
1720
 
  proc_info=thd->proc_info;
 
1720
  proc_info=thd->get_proc_info();
1721
1721
  thd_proc_info(thd, "Waiting for table");
1722
1722
  if (!thd->killed)
1723
1723
    (void) pthread_cond_wait(cond, mutex);
5315
5315
      {
5316
5316
        /* This can happen only for JOIN ... ON. */
5317
5317
        assert(table_ref->nested_join->join_list.elements == 2);
5318
 
        swap_variables(TableList*, same_level_left_neighbor, cur_table_ref);
 
5318
        std::swap(same_level_left_neighbor, cur_table_ref);
5319
5319
      }
5320
5320
 
5321
5321
      /*
5359
5359
      back for 'mark_common_columns'.
5360
5360
    */
5361
5361
    if (table_ref_2->outer_join & JOIN_TYPE_RIGHT)
5362
 
      swap_variables(TableList*, table_ref_1, table_ref_2);
 
5362
      std::swap(table_ref_1, table_ref_2);
5363
5363
    if (mark_common_columns(thd, table_ref_1, table_ref_2,
5364
5364
                            using_fields, &found_using_fields))
5365
5365
      goto err;
5370
5370
      same as of an equivalent LEFT JOIN.
5371
5371
    */
5372
5372
    if (table_ref_1->outer_join & JOIN_TYPE_RIGHT)
5373
 
      swap_variables(TableList*, table_ref_1, table_ref_2);
 
5373
      std::swap(table_ref_1, table_ref_2);
5374
5374
    if (store_natural_using_join_columns(thd, table_ref, table_ref_1,
5375
5375
                                         table_ref_2, using_fields,
5376
5376
                                         found_using_fields))