← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2011-02-01 02:51:01 UTC
  • mto: (2132.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2134.
  • Revision ID: brian@tangent.org-20110201025101-yaj5kkdk2towo6ou
Merge in error message rework. Many error messages are fixed in this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
133
133
 
134
134
    if (not session || MyFlags & ME_NOREFRESH)
135
135
    {
136
 
      errmsg_printf(ERRMSG_LVL_ERROR, "%s: %s",internal::my_progname,str);
 
136
      errmsg_printf(error::ERROR, "%s: %s",internal::my_progname,str);
137
137
    }
138
138
}
139
139
 
165
165
    struct rlimit rl;
166
166
    rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
167
167
    if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
168
 
        errmsg_printf(ERRMSG_LVL_WARN,
 
168
        errmsg_printf(error::WARN,
169
169
                      _("setrlimit could not change the size of core files "
170
170
                        "to 'infinity';  We may not be able to generate a "
171
171
                        "core file on signals"));
265
265
  {
266
266
    if (chdir(getDataHome().file_string().c_str()))
267
267
    {
268
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
268
      errmsg_printf(error::ERROR,
269
269
                    _("Data directory %s does not exist\n"),
270
270
                    getDataHome().file_string().c_str());
271
271
      unireg_abort(1);
276
276
    }
277
277
    if (chdir("local"))
278
278
    {
279
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
279
      errmsg_printf(error::ERROR,
280
280
                    _("Local catalog %s/local does not exist\n"),
281
281
                    getDataHome().file_string().c_str());
282
282
      unireg_abort(1);
338
338
    unireg_abort(1);
339
339
  }
340
340
 
341
 
  errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_STARTUP)), internal::my_progname,
 
341
  errmsg_printf(error::INFO, _(ER(ER_STARTUP)), internal::my_progname,
342
342
                PANDORA_RELEASE_VERSION, COMPILATION_COMMENT);
343
343
 
344
344