← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: lbieber
  • Date: 2010-09-09 16:13:46 UTC
  • mfrom: (1750.1.1 build)
  • Revision ID: lbieber@orisndriz03-20100909161346-0peqb2kk4bujlgma
Merge Andrew - fix bug 621603: Connections status variable off by one
Merge Andrew - fix bug 621947: show processlist filldown
Merge Andrew - fix bug 628284: --mysql option broken

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
538
538
    current_global_counters.max_used_connections= connection_count;
539
539
  }
540
540
 
 
541
  current_global_counters.connections++;
541
542
  thread_id= variables.pseudo_thread_id= global_thread_id++;
542
543
 
543
544
  LOCK_thread_count.lock();
1730
1731
 
1731
1732
  flush_status_time= time((time_t*) 0);
1732
1733
  current_global_counters.max_used_connections= 1; /* We set it to one, because we know we exist */
 
1734
  current_global_counters.connections= 0;
1733
1735
}
1734
1736
 
1735
1737
user_var_entry *Session::getVariable(LEX_STRING &name, bool create_if_not_exists)