← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2009-01-30 04:45:55 UTC
  • mfrom: (779.4.10 devel)
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090130044555-ntb3509c8o6e3sb5
Merged from me.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2574
2574
      {
2575
2575
        ha_autocommit_or_rollback(session, 1);
2576
2576
        close_thread_tables(session);
2577
 
        tmp_disable_binlog(session); // binlogging is done by caller if wanted
2578
2577
        result_code= mysql_recreate_table(session, table);
2579
 
        reenable_binlog(session);
2580
2578
        /*
2581
2579
          mysql_recreate_table() can push OK or ERROR.
2582
2580
          Clear 'OK' status. If there is an error, keep it:
2677
2675
      TableList *save_next_local= table->next_local,
2678
2676
                 *save_next_global= table->next_global;
2679
2677
      table->next_local= table->next_global= 0;
2680
 
      tmp_disable_binlog(session); // binlogging is done by caller if wanted
2681
2678
      result_code= mysql_recreate_table(session, table);
2682
 
      reenable_binlog(session);
2683
2679
      /*
2684
2680
        mysql_recreate_table() can push OK or ERROR.
2685
2681
        Clear 'OK' status. If there is an error, keep it:
3732
3728
    Create a table with a temporary name.
3733
3729
    We don't log the statement, it will be logged later.
3734
3730
  */
3735
 
  tmp_disable_binlog(session);
3736
3731
  error= mysql_create_table(session, new_db, tmp_name,
3737
3732
                            create_info, alter_info, 1, 0);
3738
 
  reenable_binlog(session);
3739
3733
 
3740
3734
  return(error);
3741
3735
}