← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/loader.cc

  • Committer: Lee Bieber
  • Date: 2010-12-02 20:07:39 UTC
  • mfrom: (1968.1.3 build)
  • Revision ID: kalebral@gmail.com-20101202200739-w4el9ey7b4m5laug
Merge Vijay - Merge refactor of bool type sys_vars to the new system
Merge Monty - fix bug 683842: remove generic catch blocks       
Merge Monty sys_var cleanup for haildb

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/loader.cc
1719
1719
        add_sys_var_to_list(v);
1720
1720
        test_module->addSysVar(v);
1721
1721
      }
1722
 
      catch (...)
 
1722
      catch (std::exception&)
1723
1723
      {
1724
1724
        errmsg_printf(ERRMSG_LVL_ERROR,
1725
1725
                      _("Plugin '%s' has conflicting system variables"),