← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/get_system_var.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 23:00:55 UTC
  • mfrom: (2208.1.4 build)
  • Revision ID: kalebral@gmail.com-20110228230055-g9cq8faquzm5cvpi
Merge Olaf - Remove Session::change_item_tree
Merge Shrew/Joe - 720908: slave will not reconnect if initial connection to master is unsuccessful
Merge Shrews - 723923: Make sleep intervals for slave plugin configurable
Merge Patrck - 726784: dbqp not properly resetting itself after a test failure 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
52
52
    return(1);                             // Impossible
53
53
 
54
54
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
55
 
  session->change_item_tree(ref, item);
 
55
  *ref= item;
56
56
 
57
57
  return(0);
58
58
}