← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Eric Day
  • Date: 2009-08-31 23:50:37 UTC
  • mto: This revision was merged to the branch mainline in revision 1134.
  • Revision ID: eday@oddments.org-20090831235037-hwwe6zhq94o4lxtd
Removed purecov messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2218
2218
        session->close_thread_tables();
2219
2219
        continue;
2220
2220
      case -1:           // error, message could be written to net
2221
 
        /* purecov: begin inspected */
2222
2221
        goto err;
2223
 
        /* purecov: end */
2224
2222
      default:           // should be 0 otherwise
2225
2223
        ;
2226
2224
      }
2245
2243
 
2246
2244
    if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)
2247
2245
    {
2248
 
      /* purecov: begin inspected */
2249
2246
      char buff[FN_REFLEN + DRIZZLE_ERRMSG_SIZE];
2250
2247
      uint32_t length;
2251
2248
      session->client->store(table_name);
2262
2259
      if (session->client->flush())
2263
2260
        goto err;
2264
2261
      continue;
2265
 
      /* purecov: end */
2266
2262
    }
2267
2263
 
2268
2264
    /* Close all instances of the table to allow repair to rename files */
2284
2280
 
2285
2281
    if (table->table->s->crashed && operator_func == &handler::ha_check)
2286
2282
    {
2287
 
      /* purecov: begin inspected */
2288
2283
      session->client->store(table_name);
2289
2284
      session->client->store(operator_name);
2290
2285
      session->client->store(STRING_WITH_LEN("warning"));
2291
2286
      session->client->store(STRING_WITH_LEN("Table is marked as crashed"));
2292
2287
      if (session->client->flush())
2293
2288
        goto err;
2294
 
      /* purecov: end */
2295
2289
    }
2296
2290
 
2297
2291
    result_code = (table->table->file->*operator_func)(session, check_opt);
2677
2671
    if (err || !session->open_temporary_table(dst_path, db, table_name, 1, OTM_OPEN))
2678
2672
    {
2679
2673
      (void) session->rm_temporary_table(create_info->db_type, dst_path);
2680
 
      goto err;     /* purecov: inspected */
 
2674
      goto err;
2681
2675
    }
2682
2676
  }
2683
2677
  else if (err)
2684
2678
  {
2685
2679
    (void) quick_rm_table(create_info->db_type, db,
2686
 
                          table_name, false); /* purecov: inspected */
2687
 
    goto err;       /* purecov: inspected */
 
2680
                          table_name, false);
 
2681
    goto err;
2688
2682
  }
2689
2683
 
2690
2684
  /*
3981
3975
    return -1;
3982
3976
 
3983
3977
  if (!(copy= new CopyField[to->s->fields]))
3984
 
    return -1;                          /* purecov: inspected */
 
3978
    return -1;
3985
3979
 
3986
3980
  if (to->file->ha_external_lock(session, F_WRLCK))
3987
3981
    return -1;