← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: lbieber
  • Date: 2009-06-12 17:51:58 UTC
  • mfrom: (1061 staging)
  • mto: (1061.1.3 merge-all)
  • mto: This revision was merged to the branch mainline in revision 1062.
  • Revision ID: lbieber@lbieber-laptop-20090612175158-v6k2st8gvs81z3dn
sync with latest from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
551
551
    for (;;)
552
552
    {
553
553
      var->plugin= plugin;
554
 
      if (!var->next)
 
554
      if (! var->getNext())
555
555
        break;
556
 
      var= var->next->cast_pluginvar();
 
556
      var= var->getNext()->cast_pluginvar();
557
557
    }
558
558
  }
559
559
 
1517
1517
static void plugin_vars_free_values(sys_var *vars)
1518
1518
{
1519
1519
 
1520
 
  for (sys_var *var= vars; var; var= var->next)
 
1520
  for (sys_var *var= vars; var; var= var->getNext())
1521
1521
  {
1522
1522
    sys_var_pluginvar *piv= var->cast_pluginvar();
1523
1523
    if (piv &&
2212
2212
    }
2213
2213
    if (chain.first)
2214
2214
    {
2215
 
      chain.last->next = NULL;
 
2215
      chain.last->setNext(NULL);
2216
2216
      if (mysql_add_sys_var_chain(chain.first, NULL))
2217
2217
      {
2218
2218
        errmsg_printf(ERRMSG_LVL_ERROR, _("Plugin '%s' has conflicting system variables"),