← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handlerton.cc

  • Committer: Mark Atwood
  • Date: 2009-01-05 04:37:22 UTC
  • mto: (758.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: me@mark.atwood.name-20090105043722-03l4mzcxi4yjjjih
replace sql_print_error etc with errmsg_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handlerton.cc
235
235
  {
236
236
    if (plugin->plugin->init(hton))
237
237
    {
238
 
      sql_print_error(_("Plugin '%s' init function returned error."),
 
238
      errmsg_printf(ERRMSG_LVL_ERROR, _("Plugin '%s' init function returned error."),
239
239
                      plugin->name.str);
240
240
      goto err;
241
241
    }
265
265
 
266
266
        if (idx == (int) DB_TYPE_DEFAULT)
267
267
        {
268
 
          sql_print_warning(_("Too many storage engines!"));
 
268
          errmsg_printf(ERRMSG_LVL_WARN, _("Too many storage engines!"));
269
269
          return(1);
270
270
        }
271
271
        if (hton->db_type != DB_TYPE_UNKNOWN)
272
 
          sql_print_warning(_("Storage engine '%s' has conflicting typecode. "
273
 
                            "Assigning value %d."), plugin->plugin->name, idx);
 
272
          errmsg_printf(ERRMSG_LVL_WARN,
 
273
                        _("Storage engine '%s' has conflicting typecode. Assigning value %d."),
 
274
                        plugin->plugin->name, idx);
274
275
        hton->db_type= (enum legacy_db_type) idx;
275
276
      }
276
277
      installed_htons[hton->db_type]= hton;