← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merge padraig's conflict resolves and trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1861
1861
  reset_status_vars();
1862
1862
 
1863
1863
  /* Reset the counters of all key caches (default and named). */
1864
 
  process_key_caches(reset_key_cache_counters);
 
1864
  reset_key_cache_counters();
1865
1865
  flush_status_time= time((time_t*) 0);
1866
1866
  max_used_connections= 1; /* We set it to one, because we know we exist */
1867
1867
  pthread_mutex_unlock(&LOCK_status);