← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2009-06-03 19:30:45 UTC
  • mfrom: (1046.1.6 merge)
  • Revision ID: brian@gaz-20090603193045-4xgeczyfixh07beg
Merge for Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
191
191
   in_lock_tables(0),
192
192
   derived_tables_processing(false),
193
193
   m_lip(NULL),
194
 
   scheduler(0)
 
194
   scheduler(0),
 
195
   cached_table(0)
195
196
{
196
197
  uint64_t tmp;
197
198
 
408
409
    unlock_global_read_lock(this);
409
410
 
410
411
  cleanup_done= true;
411
 
  return;
412
412
}
413
413
 
414
414
Session::~Session()
548
548
    }
549
549
    pthread_mutex_unlock(&mysys_var->mutex);
550
550
  }
551
 
  return;
552
551
}
553
552
 
554
553
/*
1011
1010
              table->file->has_transactions());
1012
1011
  add_changed_table(table->s->table_cache_key.str,
1013
1012
                    (long) table->s->table_cache_key.length);
1014
 
  return;
1015
1013
}
1016
1014
 
1017
1015
 
1033
1031
      cmp = memcmp(curr->key, key, curr->key_length);
1034
1032
      if (cmp < 0)
1035
1033
      {
1036
 
        list_include(prev_changed, curr, changed_table_dup(key, key_length));
1037
 
        return;
 
1034
        list_include(prev_changed, curr, changed_table_dup(key, key_length));
 
1035
        return;
1038
1036
      }
1039
1037
      else if (cmp == 0)
1040
1038
      {
1041
 
        return;
 
1039
        return;
1042
1040
      }
1043
1041
    }
1044
1042
  }
1045
1043
  *prev_changed = changed_table_dup(key, key_length);
1046
 
  return;
1047
1044
}
1048
1045
 
1049
1046
 
1580
1577
void select_max_min_finder_subselect::cleanup()
1581
1578
{
1582
1579
  cache= 0;
1583
 
  return;
1584
1580
}
1585
1581
 
1586
1582
 
1754
1750
  table_charset= 0;
1755
1751
  precomputed_group_by= 0;
1756
1752
  bit_fields_as_long= 0;
1757
 
  return;
1758
1753
}
1759
1754
 
1760
1755
void Tmp_Table_Param::cleanup(void)
1820
1815
  backup->set_open_tables_state(this);
1821
1816
  reset_open_tables_state();
1822
1817
  state_flags|= Open_tables_state::BACKUPS_AVAIL;
1823
 
  return;
1824
1818
}
1825
1819
 
1826
1820
 
1831
1825
    to be sure that it was properly cleaned up.
1832
1826
  */
1833
1827
  assert(open_tables == 0 && temporary_tables == 0 &&
1834
 
              handler_tables == 0 && derived_tables == 0 &&
 
1828
              derived_tables == 0 &&
1835
1829
              lock == 0 && locked_tables == 0);
1836
1830
  set_open_tables_state(backup);
1837
 
  return;
1838
1831
}
1839
1832
 
1840
1833
 
2016
2009
  main_da.reset_diagnostics_area();
2017
2010
  total_warn_count=0;                   // Warnings for this query
2018
2011
  sent_row_count= examined_row_count= 0;
2019
 
 
2020
 
  return;
2021
2012
}
2022
2013
 
2023
2014
/*
2038
2029
    tmp_next= table->next;
2039
2030
    close_temporary(table, 1, 1);
2040
2031
  }
2041
 
  temporary_tables= 0;
2042
 
 
2043
 
  return;
 
2032
  temporary_tables= NULL;
2044
2033
}
2045
2034
 
2046
2035