~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Brian Aker
  • Date: 2008-08-18 04:35:40 UTC
  • mfrom: (342 codestyle)
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: brian@tangent.org-20080818043540-numg7vydi7b0bzcd
Mering Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
359
359
  {
360
360
    if (plugin->plugin->init(hton))
361
361
    {
362
 
      sql_print_error("Plugin '%s' init function returned error.",
 
362
      sql_print_error(_("Plugin '%s' init function returned error."),
363
363
                      plugin->name.str);
364
364
      goto err;
365
365
    }
387
387
 
388
388
        if (idx == (int) DB_TYPE_DEFAULT)
389
389
        {
390
 
          sql_print_warning("Too many storage engines!");
 
390
          sql_print_warning(_("Too many storage engines!"));
391
391
          return(1);
392
392
        }
393
393
        if (hton->db_type != DB_TYPE_UNKNOWN)
394
 
          sql_print_warning("Storage engine '%s' has conflicting typecode. "
395
 
                            "Assigning value %d.", plugin->plugin->name, idx);
 
394
          sql_print_warning(_("Storage engine '%s' has conflicting typecode. "
 
395
                            "Assigning value %d."), plugin->plugin->name, idx);
396
396
        hton->db_type= (enum legacy_db_type) idx;
397
397
      }
398
398
      installed_htons[hton->db_type]= hton;
1275
1275
  {
1276
1276
    while ((got= hton->recover(hton, info->list, info->len)) > 0 )
1277
1277
    {
1278
 
      sql_print_information("Found %d prepared transaction(s) in %s",
 
1278
      sql_print_information(_("Found %d prepared transaction(s) in %s"),
1279
1279
                            got, ha_resolve_storage_engine_name(hton));
1280
1280
      for (int i=0; i < got; i ++)
1281
1281
      {
1327
1327
    return(0);
1328
1328
 
1329
1329
  if (info.commit_list)
1330
 
    sql_print_information("Starting crash recovery...");
 
1330
    sql_print_information(_("Starting crash recovery..."));
1331
1331
 
1332
1332
 
1333
1333
#ifndef WILL_BE_DELETED_LATER
1359
1359
 
1360
1360
  my_free((uchar*)info.list, MYF(0));
1361
1361
  if (info.found_foreign_xids)
1362
 
    sql_print_warning("Found %d prepared XA transactions", 
 
1362
    sql_print_warning(_("Found %d prepared XA transactions"), 
1363
1363
                      info.found_foreign_xids);
1364
1364
  if (info.dry_run && info.found_my_xids)
1365
1365
  {
1366
 
    sql_print_error("Found %d prepared transactions! It means that mysqld was "
1367
 
                    "not shut down properly last time and critical recovery "
1368
 
                    "information (last binlog or %s file) was manually deleted "
1369
 
                    "after a crash. You have to start mysqld with "
1370
 
                    "--tc-heuristic-recover switch to commit or rollback "
1371
 
                    "pending transactions.",
 
1366
    sql_print_error(_("Found %d prepared transactions! It means that drizzled "
 
1367
                    "was not shut down properly last time and critical "
 
1368
                    "recovery information (last binlog or %s file) was "
 
1369
                    "manually deleted after a crash. You have to start "
 
1370
                    "drizzled with the --tc-heuristic-recover switch to "
 
1371
                    "commit or rollback pending transactions."),
1372
1372
                    info.found_my_xids, opt_tc_log_file);
1373
1373
    return(1);
1374
1374
  }
1375
1375
  if (info.commit_list)
1376
 
    sql_print_information("Crash recovery finished.");
 
1376
    sql_print_information(_("Crash recovery finished."));
1377
1377
  return(0);
1378
1378
}
1379
1379