← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-05-30 22:30:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1045.
  • Revision ID: brian@gaz-20090530223005-hmylm6iywddfentm
A lot of little cleanups (most based off lcov)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2371
2371
      case  1:           // error, message written to net
2372
2372
        ha_autocommit_or_rollback(session, 1);
2373
2373
        session->endTransaction(ROLLBACK);
2374
 
        close_thread_tables(session);
 
2374
        session->close_thread_tables();
2375
2375
        continue;
2376
2376
      case -1:           // error, message could be written to net
2377
2377
        /* purecov: begin inspected */
2413
2413
      protocol->store(buff, length, system_charset_info);
2414
2414
      ha_autocommit_or_rollback(session, 0);
2415
2415
      session->endTransaction(COMMIT);
2416
 
      close_thread_tables(session);
 
2416
      session->close_thread_tables();
2417
2417
      lex->reset_query_tables_list(false);
2418
2418
      table->table=0;                           // For query cache
2419
2419
      if (protocol->write())
2455
2455
 
2456
2456
    if (operator_func == &handler::ha_repair && !(check_opt->use_frm))
2457
2457
    {
2458
 
      if ((table->table->file->check_old_types() == HA_ADMIN_NEEDS_ALTER) ||
2459
 
          (table->table->file->ha_check_for_upgrade(check_opt) ==
2460
 
           HA_ADMIN_NEEDS_ALTER))
 
2458
      if ((table->table->file->check_old_types() == HA_ADMIN_NEEDS_ALTER))
2461
2459
      {
2462
2460
        ha_autocommit_or_rollback(session, 1);
2463
 
        close_thread_tables(session);
 
2461
        session->close_thread_tables();
2464
2462
        result_code= mysql_recreate_table(session, table);
2465
2463
        /*
2466
2464
          mysql_recreate_table() can push OK or ERROR.
2558
2556
        reopen the table and do ha_innobase::analyze() on it.
2559
2557
      */
2560
2558
      ha_autocommit_or_rollback(session, 0);
2561
 
      close_thread_tables(session);
 
2559
      session->close_thread_tables();
2562
2560
      TableList *save_next_local= table->next_local,
2563
2561
                 *save_next_global= table->next_global;
2564
2562
      table->next_local= table->next_global= 0;
2572
2570
      if (session->main_da.is_ok())
2573
2571
        session->main_da.reset_diagnostics_area();
2574
2572
      ha_autocommit_or_rollback(session, 0);
2575
 
      close_thread_tables(session);
 
2573
      session->close_thread_tables();
2576
2574
      if (!result_code) // recreation went ok
2577
2575
      {
2578
2576
        if ((table->table= open_ltable(session, table, lock_type, 0)) &&
2652
2650
    }
2653
2651
    ha_autocommit_or_rollback(session, 0);
2654
2652
    session->endTransaction(COMMIT);
2655
 
    close_thread_tables(session);
 
2653
    session->close_thread_tables();
2656
2654
    table->table=0;                             // For query cache
2657
2655
    if (protocol->write())
2658
2656
      goto err;
2664
2662
err:
2665
2663
  ha_autocommit_or_rollback(session, 1);
2666
2664
  session->endTransaction(ROLLBACK);
2667
 
  close_thread_tables(session);                 // Shouldn't be needed
 
2665
  session->close_thread_tables();                       // Shouldn't be needed
2668
2666
  if (table)
2669
2667
    table->table=0;
2670
2668
  return(true);
4628
4626
        }
4629
4627
      }
4630
4628
      session->clear_error();
4631
 
      close_thread_tables(session);
 
4629
      session->close_thread_tables();
4632
4630
      table->table=0;                           // For query cache
4633
4631
    }
4634
4632
    if (protocol->write())
4639
4637
  return(false);
4640
4638
 
4641
4639
 err:
4642
 
  close_thread_tables(session);                 // Shouldn't be needed
 
4640
  session->close_thread_tables();                       // Shouldn't be needed
4643
4641
  if (table)
4644
4642
    table->table=0;
4645
4643
  return(true);