← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Monty Taylor
  • Date: 2009-01-25 14:29:57 UTC
  • mfrom: (811 drizzle)
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 816.
  • Revision ID: mordred@inaugust.com-20090125142957-qd2dc0x4lbdeut84
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1372
1372
    if (session->temporary_tables)
1373
1373
      table->next->prev= 0;
1374
1374
  }
1375
 
  if (session->slave_thread)
1376
 
  {
1377
 
    /* natural invariant of temporary_tables */
1378
 
    assert(slave_open_temp_tables || !session->temporary_tables);
1379
 
    slave_open_temp_tables--;
1380
 
  }
1381
1375
  close_temporary(table, free_share, delete_table);
1382
1376
  return;
1383
1377
}
3590
3584
      tmp_table->next->prev= tmp_table;
3591
3585
    session->temporary_tables= tmp_table;
3592
3586
    session->temporary_tables->prev= 0;
3593
 
    if (session->slave_thread)
3594
 
      slave_open_temp_tables++;
3595
3587
  }
3596
3588
  tmp_table->pos_in_table_list= 0;
3597
3589
  return(tmp_table);