← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-23 16:32:50 UTC
  • mto: (2247.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: olafvdspek@gmail.com-20110323163250-t3yxfmco60d9sj25
Remove some unnecessary drizzled::

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
622
622
    session              Thread handler
623
623
*/
624
624
 
625
 
void drizzled::Session::unlink(session_id_t &session_id)
 
625
void Session::unlink(session_id_t &session_id)
626
626
{
627
627
  Session::shared_ptr session= session::Cache::singleton().find(session_id);
628
628
 
630
630
    unlink(session);
631
631
}
632
632
 
633
 
void drizzled::Session::unlink(Session::shared_ptr &session)
 
633
void Session::unlink(Session::shared_ptr &session)
634
634
{
635
635
  --connection_count;
636
636
 
817
817
  global_system_variables.min_examined_row_limit= in_min_examined_row_limit;
818
818
}
819
819
 
820
 
static void check_limits_max_join_size(drizzled::ha_rows in_max_join_size)
 
820
static void check_limits_max_join_size(ha_rows in_max_join_size)
821
821
{
822
822
  global_system_variables.max_join_size= INT32_MAX;
823
823
  if ((uint64_t)in_max_join_size < 1 || (uint64_t)in_max_join_size > INT32_MAX)
1216
1216
  _("Max number of errors/warnings to store for a statement."))
1217
1217
  ("max-heap-table-size", po::value<uint64_t>(&global_system_variables.max_heap_table_size)->default_value(16*1024*1024L)->notifier(&check_limits_mhts),
1218
1218
  _("Don't allow creation of heap tables bigger than this."))
1219
 
  ("max-join-size", po::value<drizzled::ha_rows>(&global_system_variables.max_join_size)->default_value(INT32_MAX)->notifier(&check_limits_max_join_size),
 
1219
  ("max-join-size", po::value<ha_rows>(&global_system_variables.max_join_size)->default_value(INT32_MAX)->notifier(&check_limits_max_join_size),
1220
1220
  _("Joins that are probably going to read more than max_join_size records "
1221
1221
     "return an error."))
1222
1222
  ("max-length-for-sort-data", po::value<uint64_t>(&global_system_variables.max_length_for_sort_data)->default_value(1024)->notifier(&check_limits_mlfsd),